From b73e0f70cab8ebf4fc72d120a0aa12deb9b55723 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Mon, 23 Feb 2015 20:56:38 -0500
Subject: [PATCH 01/92] initial commit

---
 src/Titon/Console/ArgumentLexer.hh            | 126 ++++++++++++++++++
 src/Titon/Console/Arguments.hh                |  99 ++++++++++++++
 src/Titon/Console/Command.hh                  |  12 ++
 src/Titon/Console/Command/AbstractCommand.hh  |  14 ++
 src/Titon/Console/Console.hh                  |  23 ++++
 src/Titon/Console/InputDefinition.php         |  17 +++
 .../AbstractInputDefinition.hh                |  56 ++++++++
 src/Titon/Console/InputDefinition/Argument.hh |  12 ++
 src/Titon/Console/InputDefinition/Flag.hh     |  65 +++++++++
 src/Titon/Console/InputDefinition/Option.hh   |  38 ++++++
 src/Titon/Console/bootstrap.hh                |  30 +++++
 11 files changed, 492 insertions(+)
 create mode 100644 src/Titon/Console/ArgumentLexer.hh
 create mode 100644 src/Titon/Console/Arguments.hh
 create mode 100644 src/Titon/Console/Command.hh
 create mode 100644 src/Titon/Console/Command/AbstractCommand.hh
 create mode 100644 src/Titon/Console/Console.hh
 create mode 100644 src/Titon/Console/InputDefinition.php
 create mode 100644 src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
 create mode 100644 src/Titon/Console/InputDefinition/Argument.hh
 create mode 100644 src/Titon/Console/InputDefinition/Flag.hh
 create mode 100644 src/Titon/Console/InputDefinition/Option.hh
 create mode 100644 src/Titon/Console/bootstrap.hh

diff --git a/src/Titon/Console/ArgumentLexer.hh b/src/Titon/Console/ArgumentLexer.hh
new file mode 100644
index 0000000..74bbf26
--- /dev/null
+++ b/src/Titon/Console/ArgumentLexer.hh
@@ -0,0 +1,126 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console;
+
+use Iterator;
+
+class ArgumentLexer implements Iterator {
+
+    protected array<string> $items = array();
+
+    protected int $position;
+
+    protected int $length = 0;
+
+    protected ?string $current;
+
+    protected bool $first = true;
+
+    public function __construct(array<string> $items = array()) {
+        $this->items = $items;
+        $this->length = count($items);
+        $this->position = 0;
+    }
+
+    public function current(): mixed {
+        return $this->items[$this->position];
+    }
+
+    public function end(): bool {
+        return ($this->position + 1) === $this->length;
+    }
+
+    public function isArgument(string $value): bool {
+        return $this->isShort($value) || $this->isLong($value);
+    }
+
+    public function isLong(string $value): bool {
+        return (0 == strncmp($value, '--', 2));
+    }
+
+    public function isShort(string $value): bool {
+        return !$this->isLong($value) && (0 == strncmp($value, '-', 1));
+    }
+
+    public function key(): int {
+        return $this->position;
+    }
+
+    public function next(): void {
+        if ($this->valid()) {
+            $this->shift();
+        }
+    }
+
+    public function peek(): string {
+        return $this->processInput($this->items[0]);
+    }
+
+    public function processInput(string $input): RawInput {
+        $raw = $input;
+        $value = $input;
+
+        if ($this->isLong($input)) {
+            $value = substr($input, 2);
+        } else {
+            if ($this->isShort($input)) {
+                $value = substr($input, 1);
+            }
+        }
+
+        return shape(
+            'raw'   => $raw,
+            'value' => $value
+        );
+    }
+
+    public function rewind(): void {
+        $this->shift();
+
+        if ($this->first) {
+            $this->position = 0;
+            $this->first = false;
+        }
+    }
+
+    public function shift(): void {
+        $key = array_shift($this->items);
+
+        $matches = [];
+        if (preg_match('#\A([^\s\'"=]+)=(.+?)$#', $key, $matches)) {
+            $key = $matches[1];
+            array_unshift($this->items, $matches[2]);
+        } else {
+            $this->position += 1;
+        }
+
+        $this->current = $this->processInput($key);
+
+        if ($this->isShort($key['raw']) && strlen($key['value']) > 1) {
+            $exploded = array();
+            for ($i = strlen($key['value']); $i > 0; $i--) {
+                array_push($exploded, $key['value'][$i - 1]);
+            }
+            $key['value'] = array_pop($exploded);
+            $key['raw'] = '-' . $key['value'];
+
+            foreach ($exploded as $piece) {
+                $this->unshift('-' . $piece);
+            }
+        }
+    }
+
+    public function unshift(string $item): void {
+        array_unshift($this->items, $item);
+        $this->length += 1;
+    }
+
+    public function valid(): bool {
+        return $this->position < count($this->items);
+    }
+}
\ No newline at end of file
diff --git a/src/Titon/Console/Arguments.hh b/src/Titon/Console/Arguments.hh
new file mode 100644
index 0000000..8543ed6
--- /dev/null
+++ b/src/Titon/Console/Arguments.hh
@@ -0,0 +1,99 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console;
+
+use Iterator;
+
+class Arguments {
+
+    protected FlagMap $flags = Map {};
+
+    protected OptionMap $options = Map {};
+
+    protected ArgumentMap $arguments = Map {};
+
+    protected CommandMap $commands = Map {};
+
+    protected ArgumentLexer $input;
+
+    /**
+     * Initializes the argument parser. If you wish to change the default behaviour
+     * you may pass an array of options as the first argument. Valid options are
+     * `'help'` and `'strict'`, each a boolean.
+     *
+     * `'help'` is `true` by default, `'strict'` is false by default.
+     *
+     * @param  array $options An array of options for this parser.
+     */
+    public function __construct(array<string> $args = []) {
+        if (count($args) === 0) {
+            $args = array_slice($_SERVER['argv'], 1);
+        }
+
+        $this->input = new ArgumentLexer($args);
+    }
+
+    public function parse() {
+        foreach ($this->input as $val) {
+            if ($this->parseFlag($val)) {
+                continue;
+            }
+            if ($this->parseOption($val)) {
+                continue;
+            }
+//            if ($this->parseArgument($val)) {
+//                continue;
+//            }
+        }
+    }
+
+    public function parseFlag($key): bool {
+        if ($this->flags->contains($key)) {
+            return false;
+        }
+
+        if ($this->flags[$key]->isStackable()) {
+            $this->flags[$key]->increaseValue();
+        } else {
+            $this->flags[$key]->setValue(1);
+        }
+
+        return true;
+    }
+
+    public function parseOption(string $key): bool {
+        if (!$this->options->contains($key))) {
+            return false;
+        }
+
+        // Peak ahead to make sure we get a value.
+        if (!$this->input->end() && !$this->input->isArgument($this->input->peek()))
+            $this->options[$key]->setValue($this->options[$key]->getDefault());
+
+            return true;
+        }
+
+        $values = [];
+        foreach ($this->input as $value) {
+            array_push($values, $value);
+            if (!$this->input->end() && $this->input->isArgument($this->input->peek())) {
+                break;
+            }
+        }
+
+        $value = join($values, ' ');
+
+        if (!$value && $value !== false) {
+            $value = 1;
+        }
+
+        $this->options[$key]->setValue($value);
+
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/src/Titon/Console/Command.hh b/src/Titon/Console/Command.hh
new file mode 100644
index 0000000..eb1e34f
--- /dev/null
+++ b/src/Titon/Console/Command.hh
@@ -0,0 +1,12 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console;
+
+interface Command {
+
+}
\ No newline at end of file
diff --git a/src/Titon/Console/Command/AbstractCommand.hh b/src/Titon/Console/Command/AbstractCommand.hh
new file mode 100644
index 0000000..8c8aecb
--- /dev/null
+++ b/src/Titon/Console/Command/AbstractCommand.hh
@@ -0,0 +1,14 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\Command;
+
+use Titon\Console\Command;
+
+abstract class AbstractCommand implements Command {
+
+}
\ No newline at end of file
diff --git a/src/Titon/Console/Console.hh b/src/Titon/Console/Console.hh
new file mode 100644
index 0000000..ba8964f
--- /dev/null
+++ b/src/Titon/Console/Console.hh
@@ -0,0 +1,23 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console;
+
+class Console {
+
+    protected CommandMap $commands = Map {};
+
+    public function __construct() {
+
+    }
+
+    public function addCommand(Command $command): this {
+        $this->commands[$command->getName()] = $command;
+
+        return $this;
+    }
+}
\ No newline at end of file
diff --git a/src/Titon/Console/InputDefinition.php b/src/Titon/Console/InputDefinition.php
new file mode 100644
index 0000000..a55e3d2
--- /dev/null
+++ b/src/Titon/Console/InputDefinition.php
@@ -0,0 +1,17 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console;
+
+interface InputDefinition {
+
+    public function getDescription(): string;
+
+    public function getName(): string;
+
+    public function getValue(): mixed;
+}
\ No newline at end of file
diff --git a/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh b/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
new file mode 100644
index 0000000..af6bce6
--- /dev/null
+++ b/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
@@ -0,0 +1,56 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\InputDefinition;
+
+use Titon\Console\InputDefinition;
+
+abstract class AbstractInputDefinition implements InputDefinition {
+
+    const VALUE_OPTIONAL = 0;
+    const VALUE_REQUIRED = 1;
+
+    protected string $name;
+
+    protected string $description;
+
+    protected int $mode = self::VALUE_OPTIONAL;
+
+    protected mixed $value;
+
+    protected mixed $default;
+
+    public function __construct(string $name, string $description, int $mode = self::VALUE_OPTIONAL) {
+        $this->name = $name;
+        $this->description = $description;
+        $this->mode = $mode;
+    }
+
+    public function exists(): bool {
+        if (is_null($this->value)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function getDescription(): string {
+        return $this->description;
+    }
+
+    public function getName(): string {
+        return $this->name;
+    }
+
+    public function getValue(): mixed {
+        if (!is_null($this->value)) {
+            return $this->value;
+        }
+
+        return $this-> default;
+    }
+}
\ No newline at end of file
diff --git a/src/Titon/Console/InputDefinition/Argument.hh b/src/Titon/Console/InputDefinition/Argument.hh
new file mode 100644
index 0000000..d2447e3
--- /dev/null
+++ b/src/Titon/Console/InputDefinition/Argument.hh
@@ -0,0 +1,12 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\InputDefinition;
+
+class Argument extends AbstractInputDefinition {
+
+}
\ No newline at end of file
diff --git a/src/Titon/Console/InputDefinition/Flag.hh b/src/Titon/Console/InputDefinition/Flag.hh
new file mode 100644
index 0000000..39c0caa
--- /dev/null
+++ b/src/Titon/Console/InputDefinition/Flag.hh
@@ -0,0 +1,65 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\InputDefinition;
+
+class Flag extends AbstractInputDefinition {
+
+    protected ?string $alias;
+
+    protected bool $stackable = false;
+
+    public function __construct(string $name, string $description, int $mode = self::VALUE_OPTIONAL, bool $stackable = false) {
+        parent::__construct($name, $description, $mode);
+
+        $this->default = 0;
+        $this->stackable = $stackable;
+    }
+
+    public function getValue(): int {
+        if (!is_null($this->value)) {
+            return (int)$this->value;
+        }
+
+        return (int)$this->default;
+    }
+
+    public function increaseValue(): this {
+        if ($this->stackable) {
+            if (is_null($this->value)) {
+                $this->value = 1;
+            } else {
+                invariant($this->value instanceof \int, 'Must be an annotation.');
+
+                $this->value++;
+            }
+        }
+
+        return $this;
+    }
+
+    public function isStackable(): bool {
+        return $this->stackable;
+    }
+
+    public function setAlias(string $alias): this {
+        if (strlen($alias) > strlen($this->name)) {
+            $this->alias = $this->name;
+            $this->name = $alias;
+        } else {
+            $this->alias = $alias;
+        }
+
+        return $this;
+    }
+
+    public function setValue(int $value): this {
+        $this->value = $value;
+
+        return $this;
+    }
+}
\ No newline at end of file
diff --git a/src/Titon/Console/InputDefinition/Option.hh b/src/Titon/Console/InputDefinition/Option.hh
new file mode 100644
index 0000000..1af388c
--- /dev/null
+++ b/src/Titon/Console/InputDefinition/Option.hh
@@ -0,0 +1,38 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\InputDefinition;
+
+class Option extends AbstractInputDefinition {
+
+    protected ?string $alias;
+
+    public function getValue(mixed $default = null): mixed {
+        if (!is_null($this->value)) {
+            return $this->value;
+        }
+
+        return $default;
+    }
+
+    public function setAlias(string $alias): this {
+        if (strlen($alias) > strlen($this->name)) {
+            $this->alias = $this->name;
+            $this->name = $alias;
+        } else {
+            $this->alias = $alias;
+        }
+
+        return $this;
+    }
+
+    public function setDefault(string $default): this {
+        $this->default = $default;
+
+        return $this;
+    }
+}
\ No newline at end of file
diff --git a/src/Titon/Console/bootstrap.hh b/src/Titon/Console/bootstrap.hh
new file mode 100644
index 0000000..13bc983
--- /dev/null
+++ b/src/Titon/Console/bootstrap.hh
@@ -0,0 +1,30 @@
+<?hh
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+/**
+ * --------------------------------------------------------------
+ *  Type Aliases
+ * --------------------------------------------------------------
+ *
+ * Defines type aliases that are used by the console package.
+ */
+
+namespace Titon\Console {
+    use Titon\Console\Command;
+    use Titon\Console\InputDefinition\Flag;
+    use Titon\Console\InputDefinition\Option;
+    use Titon\Console\InputDefinition\Argument;
+
+    type Input = shape(
+        'raw' => string,
+        'value' => string
+    );
+    type CommandMap = Map<string, Command>;
+    type FlagMap = Map<string, Flag>;
+    type OptionMap = Map<string, Option>;
+    type ArgumentMap = Map<string, Argument>;
+}

From cf7cfb34d50dc5c680d139ad83cc3b6d1959d043 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Mon, 23 Feb 2015 20:58:09 -0500
Subject: [PATCH 02/92] fixed hh extension

---
 src/Titon/Console/{InputDefinition.php => InputDefinition.hh} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/Titon/Console/{InputDefinition.php => InputDefinition.hh} (100%)

diff --git a/src/Titon/Console/InputDefinition.php b/src/Titon/Console/InputDefinition.hh
similarity index 100%
rename from src/Titon/Console/InputDefinition.php
rename to src/Titon/Console/InputDefinition.hh

From 14d294faad0f281e457583af5697fb8e62ea350c Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 24 Feb 2015 17:42:54 -0500
Subject: [PATCH 03/92] initial commit

---
 src/Titon/Console/composer.json | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 src/Titon/Console/composer.json

diff --git a/src/Titon/Console/composer.json b/src/Titon/Console/composer.json
new file mode 100644
index 0000000..375ddc5
--- /dev/null
+++ b/src/Titon/Console/composer.json
@@ -0,0 +1,33 @@
+{
+  "name": "titon/console",
+  "type": "library",
+  "description": "",
+  "keywords": ["titon", "console", "cli"],
+  "homepage": "http://titon.io",
+  "license": "BSD-3-Clause",
+  "authors": [
+    {
+      "name": "Miles Johnson",
+      "homepage": "http://milesj.me"
+    },
+    {
+      "name": "Alex Phillips",
+      "homepage": "http://wootables.com"
+    }
+  ],
+  "support": {
+    "irc": "irc://irc.freenode.org/titon",
+    "source": "https://github.com/titon/console"
+  },
+  "require": {
+    "hhvm": ">=3.4.0"
+  },
+  "autoload": {
+    "psr-4": {
+      "Titon\\Console\\": "src/"
+    },
+    "files": [
+      "src/Titon/Console/bootstrap.hh"
+    ]
+  }
+}

From ad8e97e101bda7a794df3d1f514bc80656c7036f Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 24 Feb 2015 17:43:42 -0500
Subject: [PATCH 04/92] fleshed out the argument parser

---
 composer.json                                 |   1 +
 src/Titon/Console/ArgumentLexer.hh            |  38 +++---
 src/Titon/Console/Arguments.hh                | 108 ++++++++++++++----
 .../Exception/MissingValueException.hh        |  20 ++++
 .../AbstractInputDefinition.hh                |   6 +-
 src/Titon/Console/InputDefinition/Argument.hh |   5 +
 src/Titon/Console/InputDefinition/Option.hh   |   4 +
 src/Titon/Console/bootstrap.hh                |   2 +-
 tests/Titon/Console/ArgumentParserTest.hh     |  30 +++++
 9 files changed, 176 insertions(+), 38 deletions(-)
 create mode 100644 src/Titon/Console/Exception/MissingValueException.hh
 create mode 100644 tests/Titon/Console/ArgumentParserTest.hh

diff --git a/composer.json b/composer.json
index f96161b..abf68fd 100644
--- a/composer.json
+++ b/composer.json
@@ -40,6 +40,7 @@
             "src/Titon/Annotation/bootstrap.hh",
             "src/Titon/Cache/bootstrap.hh",
             "src/Titon/Common/bootstrap.hh",
+            "src/Titon/Console/bootstrap.hh",
             "src/Titon/Context/bootstrap.hh",
             "src/Titon/Controller/bootstrap.hh",
             "src/Titon/Debug/bootstrap.hh",
diff --git a/src/Titon/Console/ArgumentLexer.hh b/src/Titon/Console/ArgumentLexer.hh
index 74bbf26..69bcb3a 100644
--- a/src/Titon/Console/ArgumentLexer.hh
+++ b/src/Titon/Console/ArgumentLexer.hh
@@ -7,13 +7,13 @@
 
 namespace Titon\Console;
 
-use Iterator;
+use Titon\Common\ArgumentList;
 
-class ArgumentLexer implements Iterator {
+class ArgumentLexer<Tv> implements Iterator<Tv> {
 
-    protected array<string> $items = array();
+    public array<string> $items = array();
 
-    protected int $position;
+    protected int $position = 0;
 
     protected int $length = 0;
 
@@ -21,18 +21,17 @@ class ArgumentLexer implements Iterator {
 
     protected bool $first = true;
 
-    public function __construct(array<string> $items = array()) {
+    public function __construct(ArgumentList $items) {
         $this->items = $items;
         $this->length = count($items);
-        $this->position = 0;
     }
 
-    public function current(): mixed {
-        return $this->items[$this->position];
+    public function current(): Tv {
+        return $this->current;
     }
 
     public function end(): bool {
-        return ($this->position + 1) === $this->length;
+        return ($this->position + 1) == $this->length;
     }
 
     public function isArgument(string $value): bool {
@@ -57,11 +56,15 @@ class ArgumentLexer implements Iterator {
         }
     }
 
-    public function peek(): string {
-        return $this->processInput($this->items[0]);
+    public function peek(): ?Input {
+        if (!empty($this->items)) {
+            return $this->processInput($this->items[0]);
+        }
+
+        return null;
     }
 
-    public function processInput(string $input): RawInput {
+    public function processInput(string $input): Input {
         $raw = $input;
         $value = $input;
 
@@ -81,7 +84,6 @@ class ArgumentLexer implements Iterator {
 
     public function rewind(): void {
         $this->shift();
-
         if ($this->first) {
             $this->position = 0;
             $this->first = false;
@@ -96,7 +98,11 @@ class ArgumentLexer implements Iterator {
             $key = $matches[1];
             array_unshift($this->items, $matches[2]);
         } else {
-            $this->position += 1;
+            $this->position++;
+        }
+
+        if (is_null($key)) {
+            return;
         }
 
         $this->current = $this->processInput($key);
@@ -117,10 +123,10 @@ class ArgumentLexer implements Iterator {
 
     public function unshift(string $item): void {
         array_unshift($this->items, $item);
-        $this->length += 1;
+        $this->length++;
     }
 
     public function valid(): bool {
-        return $this->position < count($this->items);
+        return ($this->position < $this->length);
     }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/Arguments.hh b/src/Titon/Console/Arguments.hh
index 8543ed6..5312365 100644
--- a/src/Titon/Console/Arguments.hh
+++ b/src/Titon/Console/Arguments.hh
@@ -7,7 +7,11 @@
 
 namespace Titon\Console;
 
-use Iterator;
+use Titon\Common\ArgumentList;
+use Titon\Console\InputDefinition\Argument;
+use Titon\Console\InputDefinition\Flag;
+use Titon\Console\InputDefinition\Option;
+use Titon\Console\Exception\MissingValueException;
 
 class Arguments {
 
@@ -30,14 +34,62 @@ class Arguments {
      *
      * @param  array $options An array of options for this parser.
      */
-    public function __construct(array<string> $args = []) {
-        if (count($args) === 0) {
+    public function __construct(?ArgumentList $args = null) {
+        if (is_null($args) === 0) {
             $args = array_slice($_SERVER['argv'], 1);
         }
 
         $this->input = new ArgumentLexer($args);
     }
 
+    public function addArgument(Argument $argument): this {
+        $this->arguments[$argument->getName()] = $argument;
+
+        return $this;
+    }
+
+    public function addFlag(Flag $flag): this {
+        $this->flags[$flag->getName()] = $flag;
+
+        return $this;
+    }
+
+    public function addOption(Option $option): this {
+        $this->options[$option->getName()] = $option;
+
+        return $this;
+    }
+
+    public function getArgument(string $key): ?Argument {
+        if (!is_null($argument = $this->arguments->get($key))) {
+            return $argument;
+        }
+
+        return null;
+    }
+
+    public function getFlag(string $key): ?Flag {
+        if (!is_null($flag = $this->flags->get($key))) {
+            return $flag;
+        }
+
+        foreach ($this->flags as $flag) {
+            if ($key === $flag->getName() || $key === $flag->getAlias()) {
+                return $flag;
+            }
+        }
+
+        return null;
+    }
+
+    public function getOption(string $key): ?Option {
+        if (!is_null($option = $this->options->get($key))) {
+            return $option;
+        }
+
+        return null;
+    }
+
     public function parse() {
         foreach ($this->input as $val) {
             if ($this->parseFlag($val)) {
@@ -46,14 +98,27 @@ class Arguments {
             if ($this->parseOption($val)) {
                 continue;
             }
-//            if ($this->parseArgument($val)) {
-//                continue;
-//            }
+            if ($this->parseArgument($val)) {
+                continue;
+            }
+        }
+    }
+
+    public function parseArgument(Input $key): bool {
+        foreach ($this->arguments as $argument) {
+            if (is_null($argument->getValue())) {
+                $argument->setValue($key['raw']);
+
+                return true;
+            }
         }
+
+        return false;
     }
 
-    public function parseFlag($key): bool {
-        if ($this->flags->contains($key)) {
+    public function parseFlag(Input $key): bool {
+        $key = $key['value'];
+        if (is_null($flag = $this->flags->get($key))) {
             return false;
         }
 
@@ -66,24 +131,27 @@ class Arguments {
         return true;
     }
 
-    public function parseOption(string $key): bool {
-        if (!$this->options->contains($key))) {
+    public function parseOption(Input $key): bool {
+        $key = $key['value'];
+        if (is_null($option = $this->options->get($key))) {
             return false;
         }
 
         // Peak ahead to make sure we get a value.
-        if (!$this->input->end() && !$this->input->isArgument($this->input->peek()))
-            $this->options[$key]->setValue($this->options[$key]->getDefault());
-
-            return true;
+        $nextValue = $this->input->peek();
+        if (!$this->input->end() && $this->input->isArgument($nextValue['raw'])) {
+            throw new MissingValueException("No value is present for option $key");
         }
 
-        $values = [];
+        $values = Vector {};
         foreach ($this->input as $value) {
-            array_push($values, $value);
-            if (!$this->input->end() && $this->input->isArgument($this->input->peek())) {
-                break;
-            }
+            $values[] = $value['raw'];
+            break;
+
+//            $nextValue = $this->input->peek();
+//            if (!$this->input->end() && $this->input->isArgument($nextValue['raw'])) {
+//                break;
+//            }
         }
 
         $value = join($values, ' ');
@@ -92,7 +160,7 @@ class Arguments {
             $value = 1;
         }
 
-        $this->options[$key]->setValue($value);
+        $option->setValue($value);
 
         return true;
     }
diff --git a/src/Titon/Console/Exception/MissingValueException.hh b/src/Titon/Console/Exception/MissingValueException.hh
new file mode 100644
index 0000000..44eedc2
--- /dev/null
+++ b/src/Titon/Console/Exception/MissingValueException.hh
@@ -0,0 +1,20 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\Exception;
+
+use RuntimeException;
+
+/**
+ * Exception thrown when a value is required and not present. This can be the
+ * case with options or arguments.
+ *
+ * @package Titon\Context\Exception
+ */
+class MissingValueException extends RuntimeException {
+
+}
diff --git a/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh b/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
index af6bce6..30f5498 100644
--- a/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
+++ b/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
@@ -38,6 +38,10 @@ abstract class AbstractInputDefinition implements InputDefinition {
         return true;
     }
 
+    public function getDefault(): mixed {
+        return $this->default;
+    }
+
     public function getDescription(): string {
         return $this->description;
     }
@@ -51,6 +55,6 @@ abstract class AbstractInputDefinition implements InputDefinition {
             return $this->value;
         }
 
-        return $this-> default;
+        return $this->default;
     }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/InputDefinition/Argument.hh b/src/Titon/Console/InputDefinition/Argument.hh
index d2447e3..2d650cb 100644
--- a/src/Titon/Console/InputDefinition/Argument.hh
+++ b/src/Titon/Console/InputDefinition/Argument.hh
@@ -9,4 +9,9 @@ namespace Titon\Console\InputDefinition;
 
 class Argument extends AbstractInputDefinition {
 
+    public function setValue(string $value): this {
+        $this->value = $value;
+
+        return $this;
+    }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/InputDefinition/Option.hh b/src/Titon/Console/InputDefinition/Option.hh
index 1af388c..ede9037 100644
--- a/src/Titon/Console/InputDefinition/Option.hh
+++ b/src/Titon/Console/InputDefinition/Option.hh
@@ -35,4 +35,8 @@ class Option extends AbstractInputDefinition {
 
         return $this;
     }
+
+    public function setValue(string $value): this {
+        $this->value = $value;
+    }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/bootstrap.hh b/src/Titon/Console/bootstrap.hh
index 13bc983..794d986 100644
--- a/src/Titon/Console/bootstrap.hh
+++ b/src/Titon/Console/bootstrap.hh
@@ -20,7 +20,7 @@ namespace Titon\Console {
     use Titon\Console\InputDefinition\Argument;
 
     type Input = shape(
-        'raw' => string,
+        'raw'   => string,
         'value' => string
     );
     type CommandMap = Map<string, Command>;
diff --git a/tests/Titon/Console/ArgumentParserTest.hh b/tests/Titon/Console/ArgumentParserTest.hh
new file mode 100644
index 0000000..8883522
--- /dev/null
+++ b/tests/Titon/Console/ArgumentParserTest.hh
@@ -0,0 +1,30 @@
+<?hh
+
+use Titon\Test\TestCase;
+
+use Titon\Console\Arguments;
+use Titon\Console\InputDefinition\Flag;
+use Titon\Console\InputDefinition\Option;
+use Titon\Console\InputDefinition\Argument;
+
+class ArgumentParserTest extends TestCase {
+
+    public function testParseFlags() {
+        $args = new Arguments([
+            '-f',
+            'FooBar',
+            '--name',
+            'Alex Phillips',
+        ]);
+
+        $args->addFlag(new Flag('f', 'Foo!'));
+        $args->addOption(new Option('name', 'Your name'));
+        $args->addArgument(new Argument('bar', 'Bar!'));
+
+        $args->parse();
+
+        $this->assertEquals(1, $args->getFlag('f')->getValue());
+        $this->assertEquals('Alex Phillips', $args->getOption('name')->getValue());
+        $this->assertEquals('FooBar', $args->getArgument('bar')->getValue());
+    }
+}
\ No newline at end of file

From ced7517016a7c73f7712bc830b44203c9673fec9 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Wed, 25 Feb 2015 17:36:36 -0500
Subject: [PATCH 05/92] added argument parsing support for flags, options, and
 arguments

---
 src/Titon/Console/ArgumentBag.hh              |  26 ++++
 src/Titon/Console/ArgumentLexer.hh            |  30 +++--
 src/Titon/Console/Arguments.hh                |  56 ++++-----
 .../AbstractInputDefinition.hh                |  29 ++++-
 src/Titon/Console/InputDefinition/Flag.hh     |  15 +--
 src/Titon/Console/InputDefinition/Option.hh   |  13 --
 tests/Titon/Console/ArgumentParserTest.hh     | 113 +++++++++++++++++-
 7 files changed, 203 insertions(+), 79 deletions(-)
 create mode 100644 src/Titon/Console/ArgumentBag.hh

diff --git a/src/Titon/Console/ArgumentBag.hh b/src/Titon/Console/ArgumentBag.hh
new file mode 100644
index 0000000..c99a1c4
--- /dev/null
+++ b/src/Titon/Console/ArgumentBag.hh
@@ -0,0 +1,26 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console;
+
+use Titon\Common\Bag\AbstractBag;
+
+class ArgumentBag extends AbstractBag<string, InputDefinition> {
+
+    public function get(string $key, ?InputDefinition $default = null): ?InputDefinition {
+        $arg = null;
+        if (is_null($arg = parent::get($key))) {
+            foreach ($this as $val) {
+                if ($key === $val->getAlias()) {
+                    return $val;
+                }
+            }
+        }
+
+        return $arg;
+    }
+}
\ No newline at end of file
diff --git a/src/Titon/Console/ArgumentLexer.hh b/src/Titon/Console/ArgumentLexer.hh
index 69bcb3a..f70e1f4 100644
--- a/src/Titon/Console/ArgumentLexer.hh
+++ b/src/Titon/Console/ArgumentLexer.hh
@@ -34,12 +34,27 @@ class ArgumentLexer<Tv> implements Iterator<Tv> {
         return ($this->position + 1) == $this->length;
     }
 
+    private function explode(): void {
+        if (!$this->isShort($this->current['raw']) || strlen($this->current['value']) <= 1) {
+            return false;
+        }
+
+        $exploded = str_split($this->current['value']);
+
+        $this->current['value'] = array_pop($exploded);
+        $this->current['raw'] = '-' . $this->current['value'];
+
+        foreach ($exploded as $piece) {
+            $this->unshift('-' . $piece);
+        }
+    }
+
     public function isArgument(string $value): bool {
         return $this->isShort($value) || $this->isLong($value);
     }
 
     public function isLong(string $value): bool {
-        return (0 == strncmp($value, '--', 2));
+         return (0 == strncmp($value, '--', 2));
     }
 
     public function isShort(string $value): bool {
@@ -107,18 +122,7 @@ class ArgumentLexer<Tv> implements Iterator<Tv> {
 
         $this->current = $this->processInput($key);
 
-        if ($this->isShort($key['raw']) && strlen($key['value']) > 1) {
-            $exploded = array();
-            for ($i = strlen($key['value']); $i > 0; $i--) {
-                array_push($exploded, $key['value'][$i - 1]);
-            }
-            $key['value'] = array_pop($exploded);
-            $key['raw'] = '-' . $key['value'];
-
-            foreach ($exploded as $piece) {
-                $this->unshift('-' . $piece);
-            }
-        }
+        $this->explode();
     }
 
     public function unshift(string $item): void {
diff --git a/src/Titon/Console/Arguments.hh b/src/Titon/Console/Arguments.hh
index 5312365..437bf16 100644
--- a/src/Titon/Console/Arguments.hh
+++ b/src/Titon/Console/Arguments.hh
@@ -15,47 +15,42 @@ use Titon\Console\Exception\MissingValueException;
 
 class Arguments {
 
-    protected FlagMap $flags = Map {};
-
-    protected OptionMap $options = Map {};
-
     protected ArgumentMap $arguments = Map {};
 
     protected CommandMap $commands = Map {};
 
+    protected ArgumentBag $flags;
+
     protected ArgumentLexer $input;
 
-    /**
-     * Initializes the argument parser. If you wish to change the default behaviour
-     * you may pass an array of options as the first argument. Valid options are
-     * `'help'` and `'strict'`, each a boolean.
-     *
-     * `'help'` is `true` by default, `'strict'` is false by default.
-     *
-     * @param  array $options An array of options for this parser.
-     */
+    protected OptionMap $options = Map {};
+
     public function __construct(?ArgumentList $args = null) {
         if (is_null($args) === 0) {
             $args = array_slice($_SERVER['argv'], 1);
         }
 
+        $this->flags = new ArgumentBag();
+        $this->options = new ArgumentBag();
+        $this->arguments = new ArgumentBag();
+
         $this->input = new ArgumentLexer($args);
     }
 
     public function addArgument(Argument $argument): this {
-        $this->arguments[$argument->getName()] = $argument;
+        $this->arguments->set($argument->getName(), $argument);
 
         return $this;
     }
 
     public function addFlag(Flag $flag): this {
-        $this->flags[$flag->getName()] = $flag;
+        $this->flags->set($flag->getName(), $flag);
 
         return $this;
     }
 
     public function addOption(Option $option): this {
-        $this->options[$option->getName()] = $option;
+        $this->options->set($option->getName(), $option);
 
         return $this;
     }
@@ -122,10 +117,10 @@ class Arguments {
             return false;
         }
 
-        if ($this->flags[$key]->isStackable()) {
-            $this->flags[$key]->increaseValue();
+        if ($this->flags->get($key)->isStackable()) {
+            $this->flags->get($key)->increaseValue();
         } else {
-            $this->flags[$key]->setValue(1);
+            $this->flags->get($key)->setValue(1);
         }
 
         return true;
@@ -143,21 +138,16 @@ class Arguments {
             throw new MissingValueException("No value is present for option $key");
         }
 
-        $values = Vector {};
-        foreach ($this->input as $value) {
-            $values[] = $value['raw'];
-            break;
-
-//            $nextValue = $this->input->peek();
-//            if (!$this->input->end() && $this->input->isArgument($nextValue['raw'])) {
-//                break;
-//            }
-        }
+        $this->input->shift();
+        $value = $this->input->current();
 
-        $value = join($values, ' ');
-
-        if (!$value && $value !== false) {
-            $value = 1;
+        $matches = [];
+        if (preg_match('#\A"(.+)"$#', $value['raw'], $matches)) {
+            $value = $matches[1];
+        } else if (preg_match("#\A'(.+)'$#", $value['raw'], $matches)) {
+            $value = $matches[1];
+        } else {
+            $value = $value['raw'];
         }
 
         $option->setValue($value);
diff --git a/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh b/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
index 30f5498..c373dac 100644
--- a/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
+++ b/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
@@ -14,22 +14,28 @@ abstract class AbstractInputDefinition implements InputDefinition {
     const VALUE_OPTIONAL = 0;
     const VALUE_REQUIRED = 1;
 
-    protected string $name;
+    protected ?string $alias;
+
+    protected mixed $default;
 
     protected string $description;
 
     protected int $mode = self::VALUE_OPTIONAL;
 
-    protected mixed $value;
+    protected string $name;
 
-    protected mixed $default;
+    protected mixed $value;
 
-    public function __construct(string $name, string $description, int $mode = self::VALUE_OPTIONAL) {
+    public function __construct(string $name, string $description = '', int $mode = self::VALUE_OPTIONAL) {
         $this->name = $name;
         $this->description = $description;
         $this->mode = $mode;
     }
 
+    public function alias(string $alias): this {
+        return $this->setAlias($alias);
+    }
+
     public function exists(): bool {
         if (is_null($this->value)) {
             return false;
@@ -38,6 +44,10 @@ abstract class AbstractInputDefinition implements InputDefinition {
         return true;
     }
 
+    public function getAlias(): ?string {
+        return $this->alias;
+    }
+
     public function getDefault(): mixed {
         return $this->default;
     }
@@ -57,4 +67,15 @@ abstract class AbstractInputDefinition implements InputDefinition {
 
         return $this->default;
     }
+
+    public function setAlias(string $alias): this {
+        if (strlen($alias) > strlen($this->name)) {
+            $this->alias = $this->name;
+            $this->name = $alias;
+        } else {
+            $this->alias = $alias;
+        }
+
+        return $this;
+    }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/InputDefinition/Flag.hh b/src/Titon/Console/InputDefinition/Flag.hh
index 39c0caa..fbe5512 100644
--- a/src/Titon/Console/InputDefinition/Flag.hh
+++ b/src/Titon/Console/InputDefinition/Flag.hh
@@ -9,11 +9,9 @@ namespace Titon\Console\InputDefinition;
 
 class Flag extends AbstractInputDefinition {
 
-    protected ?string $alias;
-
     protected bool $stackable = false;
 
-    public function __construct(string $name, string $description, int $mode = self::VALUE_OPTIONAL, bool $stackable = false) {
+    public function __construct(string $name, string $description = '', int $mode = self::VALUE_OPTIONAL, bool $stackable = false) {
         parent::__construct($name, $description, $mode);
 
         $this->default = 0;
@@ -33,7 +31,7 @@ class Flag extends AbstractInputDefinition {
             if (is_null($this->value)) {
                 $this->value = 1;
             } else {
-                invariant($this->value instanceof \int, 'Must be an annotation.');
+                invariant(is_int($this->value), 'Must be an integer.');
 
                 $this->value++;
             }
@@ -46,13 +44,8 @@ class Flag extends AbstractInputDefinition {
         return $this->stackable;
     }
 
-    public function setAlias(string $alias): this {
-        if (strlen($alias) > strlen($this->name)) {
-            $this->alias = $this->name;
-            $this->name = $alias;
-        } else {
-            $this->alias = $alias;
-        }
+    public function setStackable(bool $stackable): this {
+        $this->stackable = $stackable;
 
         return $this;
     }
diff --git a/src/Titon/Console/InputDefinition/Option.hh b/src/Titon/Console/InputDefinition/Option.hh
index ede9037..9bf6db4 100644
--- a/src/Titon/Console/InputDefinition/Option.hh
+++ b/src/Titon/Console/InputDefinition/Option.hh
@@ -9,8 +9,6 @@ namespace Titon\Console\InputDefinition;
 
 class Option extends AbstractInputDefinition {
 
-    protected ?string $alias;
-
     public function getValue(mixed $default = null): mixed {
         if (!is_null($this->value)) {
             return $this->value;
@@ -19,17 +17,6 @@ class Option extends AbstractInputDefinition {
         return $default;
     }
 
-    public function setAlias(string $alias): this {
-        if (strlen($alias) > strlen($this->name)) {
-            $this->alias = $this->name;
-            $this->name = $alias;
-        } else {
-            $this->alias = $alias;
-        }
-
-        return $this;
-    }
-
     public function setDefault(string $default): this {
         $this->default = $default;
 
diff --git a/tests/Titon/Console/ArgumentParserTest.hh b/tests/Titon/Console/ArgumentParserTest.hh
index 8883522..63a34d1 100644
--- a/tests/Titon/Console/ArgumentParserTest.hh
+++ b/tests/Titon/Console/ArgumentParserTest.hh
@@ -10,21 +10,124 @@ use Titon\Console\InputDefinition\Argument;
 class ArgumentParserTest extends TestCase {
 
     public function testParseFlags() {
+        /*
+         * Check basic flag
+         */
+        $args = new Arguments([
+            '--foo',
+        ]);
+        $args->addFlag((new Flag('foo'))->alias('f'));
+        $args->parse();
+
+        $this->assertEquals(1, $args->getFlag('foo')->getValue());
+        $this->assertEquals(1, $args->getFlag('f')->getValue());
+
         $args = new Arguments([
             '-f',
-            'FooBar',
+        ]);
+        $args->addFlag((new Flag('foo'))->alias('f'));
+        $args->parse();
+
+        $this->assertEquals(1, $args->getFlag('foo')->getValue());
+        $this->assertEquals(1, $args->getFlag('f')->getValue());
+
+        /*
+         * Check stacked, but different, flags
+         */
+        $args = new Arguments([
+            '-fb',
+        ]);
+        $args->addFlag((new Flag('foo'))->alias('f'));
+        $args->addFlag((new Flag('bar'))->alias('b'));
+        $args->parse();
+
+        $this->assertEquals(1, $args->getFlag('foo')->getValue());
+        $this->assertEquals(1, $args->getFlag('bar')->getValue());
+
+        /*
+         * Check stacked flag
+         */
+        $args = new Arguments([
+            '-vvv',
+        ]);
+        $args->addFlag((new Flag('v'))->setStackable(true));
+        $args->parse();
+
+        $this->assertEquals(3, $args->getFlag('v')->getValue());
+    }
+
+    public function testParseOptions() {
+        $args = new Arguments([
             '--name',
             'Alex Phillips',
         ]);
+        $args->addOption((new Option('name'))->alias('n'));
+        $args->addArgument(new Argument('bar', 'Bar!'));
+        $args->parse();
+
+        $this->assertEquals('Alex Phillips', $args->getOption('name')->getValue());
+        $this->assertEquals('Alex Phillips', $args->getOption('n')->getValue());
 
-        $args->addFlag(new Flag('f', 'Foo!'));
-        $args->addOption(new Option('name', 'Your name'));
+        $args = new Arguments([
+            '--name',
+            'Alex Phillips',
+        ]);
+        $args->addOption((new Option('name'))->alias('n'));
         $args->addArgument(new Argument('bar', 'Bar!'));
+        $args->parse();
+
+        $this->assertEquals('Alex Phillips', $args->getOption('name')->getValue());
+        $this->assertEquals('Alex Phillips', $args->getOption('n')->getValue());
 
+        $args = new Arguments([
+            '-n',
+            'Alex Phillips',
+        ]);
+        $args->addOption((new Option('name'))->alias('n'));
+        $args->addArgument(new Argument('bar', 'Bar!'));
+        $args->parse();
+
+        $this->assertEquals('Alex Phillips', $args->getOption('name')->getValue());
+        $this->assertEquals('Alex Phillips', $args->getOption('n')->getValue());
+
+        $args = new Arguments([
+            '--name="Alex Phillips"',
+        ]);
+        $args->addOption((new Option('name'))->alias('n'));
+        $args->addArgument(new Argument('bar', 'Bar!'));
         $args->parse();
 
-        $this->assertEquals(1, $args->getFlag('f')->getValue());
         $this->assertEquals('Alex Phillips', $args->getOption('name')->getValue());
-        $this->assertEquals('FooBar', $args->getArgument('bar')->getValue());
+        $this->assertEquals('Alex Phillips', $args->getOption('n')->getValue());
+    }
+
+    public function testParseArguments() {
+        $args = new Arguments([
+            'Alex Phillips',
+        ]);
+        $args->addArgument(new Argument('name'));
+        $args->parse();
+
+        $this->assertEquals('Alex Phillips', $args->getArgument('name')->getValue());
+    }
+
+    public function testMixedArguments() {
+        $args = new Arguments([
+            'Alex Phillips',
+            '-fb',
+            '--baz="woot"',
+        ]);
+        $args->addFlag((new Flag('bar'))->alias('b'));
+        $args->addOption(new Option('baz'));
+        $args->addFlag((new Flag('foo'))->alias('f'));
+        $args->addArgument(new Argument('name'));
+        $args->parse();
+
+        $this->assertEquals('Alex Phillips', $args->getArgument('name')->getValue());
+        $this->assertEquals(1, $args->getFlag('foo')->getValue());
+        $this->assertEquals(1, $args->getFlag('f')->getValue());
+        $this->assertEquals(1, $args->getFlag('bar')->getValue());
+        $this->assertEquals(1, $args->getFlag('b')->getValue());
+        $this->assertEquals('woot', $args->getOption('baz')->getValue());
     }
 }
\ No newline at end of file

From c9245522c6fc4f32cece0e6f6b3b9e2294e0660e Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Thu, 26 Feb 2015 18:38:40 -0500
Subject: [PATCH 06/92] fleshed out basic abstract command, added help screen
 functionality,

---
 src/Titon/Console/Arguments.hh                |  25 ++-
 src/Titon/Console/Command.hh                  |   3 +
 src/Titon/Console/Command/AbstractCommand.hh  |  94 ++++++++++
 src/Titon/Console/HelpScreen.hh               | 164 ++++++++++++++++++
 .../AbstractInputDefinition.hh                |   8 +
 src/Titon/Console/InputDefinition/Argument.hh |   4 +
 src/Titon/Console/bootstrap.hh                |   3 -
 tests/Titon/Console/CommandTest.hh            |  39 +++++
 8 files changed, 332 insertions(+), 8 deletions(-)
 create mode 100644 src/Titon/Console/HelpScreen.hh
 create mode 100644 tests/Titon/Console/CommandTest.hh

diff --git a/src/Titon/Console/Arguments.hh b/src/Titon/Console/Arguments.hh
index 437bf16..b2fd0fa 100644
--- a/src/Titon/Console/Arguments.hh
+++ b/src/Titon/Console/Arguments.hh
@@ -15,7 +15,7 @@ use Titon\Console\Exception\MissingValueException;
 
 class Arguments {
 
-    protected ArgumentMap $arguments = Map {};
+    protected ArgumentBag $arguments;
 
     protected CommandMap $commands = Map {};
 
@@ -23,18 +23,19 @@ class Arguments {
 
     protected ArgumentLexer $input;
 
-    protected OptionMap $options = Map {};
+    protected Vector<string> $invalid = Vector {};
+
+    protected ArgumentBag $options;
 
     public function __construct(?ArgumentList $args = null) {
-        if (is_null($args) === 0) {
+        if (is_null($args)) {
             $args = array_slice($_SERVER['argv'], 1);
         }
 
+        $this->input = new ArgumentLexer($args);
         $this->flags = new ArgumentBag();
         $this->options = new ArgumentBag();
         $this->arguments = new ArgumentBag();
-
-        $this->input = new ArgumentLexer($args);
     }
 
     public function addArgument(Argument $argument): this {
@@ -63,6 +64,10 @@ class Arguments {
         return null;
     }
 
+    public function getArguments(): ArgumentBag {
+        return $this->arguments;
+    }
+
     public function getFlag(string $key): ?Flag {
         if (!is_null($flag = $this->flags->get($key))) {
             return $flag;
@@ -77,6 +82,10 @@ class Arguments {
         return null;
     }
 
+    public function getFlags(): ArgumentBag {
+        return $this->flags;
+    }
+
     public function getOption(string $key): ?Option {
         if (!is_null($option = $this->options->get($key))) {
             return $option;
@@ -85,6 +94,10 @@ class Arguments {
         return null;
     }
 
+    public function getOptions(): ArgumentBag {
+        return $this->options;
+    }
+
     public function parse() {
         foreach ($this->input as $val) {
             if ($this->parseFlag($val)) {
@@ -96,6 +109,8 @@ class Arguments {
             if ($this->parseArgument($val)) {
                 continue;
             }
+
+            $this->invalid[] = $val;
         }
     }
 
diff --git a/src/Titon/Console/Command.hh b/src/Titon/Console/Command.hh
index eb1e34f..3ba3d3a 100644
--- a/src/Titon/Console/Command.hh
+++ b/src/Titon/Console/Command.hh
@@ -9,4 +9,7 @@ namespace Titon\Console;
 
 interface Command {
 
+    public function configure(): void;
+
+    public function run(): void;
 }
\ No newline at end of file
diff --git a/src/Titon/Console/Command/AbstractCommand.hh b/src/Titon/Console/Command/AbstractCommand.hh
index 8c8aecb..1ea7d06 100644
--- a/src/Titon/Console/Command/AbstractCommand.hh
+++ b/src/Titon/Console/Command/AbstractCommand.hh
@@ -7,8 +7,102 @@
 
 namespace Titon\Console\Command;
 
+use Titon\Console\ArgumentBag;
 use Titon\Console\Command;
+use Titon\Console\Arguments;
+use Titon\Console\InputDefinition\Argument;
+use Titon\Console\InputDefinition\Flag;
+use Titon\Console\InputDefinition\Option;
 
 abstract class AbstractCommand implements Command {
 
+    protected ArgumentBag $arguments;
+
+    protected ?Arguments $input;
+
+    protected ?string $description;
+
+    protected ArgumentBag $flags;
+
+    protected string $name;
+
+    protected ArgumentBag $options;
+
+    public function __construct() {
+        $this->arguments = new ArgumentBag();
+        $this->flags = new ArgumentBag();
+        $this->options = new ArgumentBag();
+    }
+
+    public function setInput(Arguments $input): this {
+        $this->input = $input;
+
+        return $this;
+    }
+
+    public function addArgument(Argument $argument): this {
+        $this->arguments->set($argument->getName(), $argument);
+
+        return $this;
+    }
+
+        public function addFlag(Flag $flag): this {
+        $this->flags->set($flag->getName(), $flag);
+
+        return $this;
+    }
+
+        public function addOption(Option $option): this {
+        $this->options->set($option->getName(), $option);
+
+        return $this;
+    }
+
+    protected function getArgument(string $key): ?string {
+        if ($argument = $this->input->getArgument($key)) {
+            return $argument->getValue();
+        }
+
+        return null;
+    }
+
+    protected function getArguments(): ArgumentBag {
+        return $this->arguments;
+    }
+
+    protected function getFlag(string $key): ?int {
+        if ($flag = $this->input->getFlag($key)) {
+            return $flag->getValue();
+        }
+
+        return null;
+    }
+
+    protected function getFlags(): ArgumentBag {
+        return $this->flags;
+    }
+
+    protected function getOption(string $key): ?string {
+        if ($option = $this->input->getOption($key)) {
+            return $option->getValue();
+        }
+
+        return null;
+    }
+
+    protected function getOptions(): ArgumentBag {
+        return $this->options;
+    }
+
+    public function registerInput(): this {
+        foreach ($this->arguments as $name => $argument) {
+            $this->input->addArgument($argument);
+        }
+        foreach ($this->flags as $name => $flag) {
+            $this->input->addFlag($flag);
+        }
+        foreach ($this->options as $name => $option) {
+            $this->input->addOption($option);
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/HelpScreen.hh b/src/Titon/Console/HelpScreen.hh
new file mode 100644
index 0000000..2e3744d
--- /dev/null
+++ b/src/Titon/Console/HelpScreen.hh
@@ -0,0 +1,164 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console;
+
+use Titon\Console\InputDefinition\AbstractInputDefinition;
+
+class HelpScreen {
+
+    protected ?ArgumentBag $arguments;
+
+    protected ?Command $command;
+
+    protected string $description;
+
+    protected ?ArgumentBag $flags;
+
+    protected string $name;
+
+    protected ?ArgumentBag $options;
+
+    public function __construct(string $name, string $description = '', ?Arguments $arguments = null) {
+        $this->name = $name;
+        $this->description = $description;
+
+        if (is_null($arguments)) {
+            $this->arguments = new ArgumentBag();
+            $this->flags = new ArgumentBag();
+            $this->options = new ArgumentBag();
+        } else {
+            $this->arguments = $arguments->getArguments();
+            $this->flags = $arguments->getFlags();
+            $this->options = $arguments->getOptions();
+        }
+    }
+
+    public function render(): string {
+        $retval = Vector {};
+
+        $retval[] = $this->renderUsage();
+
+        if (!$this->arguments->all()->isEmpty()) {
+            if ($output = $this->renderSection($this->arguments)) {
+                $retval[] = "Arguments\n$output";
+            }
+        }
+        if (!$this->flags->all()->isEmpty()) {
+            if ($output = $this->renderSection($this->flags)) {
+                $retval[] = "Flags\n$output";
+            }
+        }
+        if (!$this->options->all()->isEmpty()) {
+            if ($output = $this->renderSection($this->options)) {
+                $retval[] = "Options\n$output";
+            }
+        }
+
+        return join($retval, "\n\n");
+    }
+
+    protected function renderSection(ArgumentBag $arguments): string {
+        $entries = Map {};
+        foreach ($arguments as $argument) {
+            $name = $argument->getFormattedName($argument->getName());
+            if ($argument->getAlias()) {
+                $name .= " ({$argument->getFormattedName($argument->getAlias())})";
+            }
+            $entries[$name] = $argument->getDescription();
+        }
+
+        $maxLength = max(array_map('strlen', $entries->keys()));
+        $descriptionLength = 80 - 4 - $maxLength;
+
+        $output = Vector {};
+        foreach ($entries as $name => $description) {
+            $formatted = '  ' . str_pad($name, $maxLength);
+            $description = explode('{{BREAK}}', wordwrap($description, $descriptionLength, "{{BREAK}}"));
+            $formatted .= '  ' . array_shift($description);
+
+            $pad = str_repeat(' ', $maxLength + 4);
+            while ($desc = array_shift($description)) {
+                $formatted .= "\n${pad}${desc}";
+            }
+
+            $formatted = "$formatted";
+
+            array_push($output, $formatted);
+        }
+
+        return join($output, "\n");
+    }
+
+    protected function renderUsage(): string {
+        $usage = Vector {};
+        if (!is_null($this->command)) {
+            $usage[] = $this->command->getName();
+
+            foreach ($this->command->getArguments() as $argument) {
+                $arg = $argument->getName();
+                if ($argument->getMode() === AbstractInputDefinition::VALUE_OPTIONAL) {
+                    $usage[] = "[$arg]";
+                }
+            }
+            foreach ($this->command->getArguments() as $argument) {
+                $arg = $argument->getName();
+                if ($argument->getAlias()) {
+                    $arg = "$arg|{$argument->getAlias()}";
+                }
+                if ($argument->getMode() === AbstractInputDefinition::VALUE_OPTIONAL) {
+                    $usage[] = "[$arg]";
+                }
+            }
+            foreach ($this->command->getArguments() as $argument) {
+                $arg = $argument->getName();
+                if ($argument->getAlias()) {
+                    $arg = "$arg|{$argument->getAlias()}";
+                }
+
+                $arg = "$arg=\"...\"";
+                if ($argument->getMode() === AbstractInputDefinition::VALUE_OPTIONAL) {
+                    $usage[] = "[$arg]";
+                }
+            }
+        } else {
+            $usage[] = "command";
+            if (!$this->flags->all()->isEmpty()) {
+                $usage[] = "[flags]";
+            }
+            if (!$this->options->all()->isEmpty()) {
+                $usage[] = "[options]";
+            }
+        }
+
+        return join(" ", $usage);
+    }
+
+    public function setCommand(Command $command): this {
+        $this->command = $command;
+
+        return $this;
+    }
+
+    public function setArguments(Arguments $arguments): this {
+        $this->arguments = $arguments;
+
+        return $this;
+    }
+
+    public function setFlags(ArgumentBag $flags): this {
+        $this->flags = $flags;
+
+        return $this;
+    }
+
+    public function setOptions(ArgumentBag $options): this {
+        $this->options = $options;
+
+        return $this;
+    }
+}
\ No newline at end of file
diff --git a/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh b/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
index c373dac..a488695 100644
--- a/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
+++ b/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
@@ -56,6 +56,14 @@ abstract class AbstractInputDefinition implements InputDefinition {
         return $this->description;
     }
 
+    public function getFormattedName(string $name): string {
+        if (strlen($name) === 1) {
+            return "-$name";
+        }
+
+        return "--$name";
+    }
+
     public function getName(): string {
         return $this->name;
     }
diff --git a/src/Titon/Console/InputDefinition/Argument.hh b/src/Titon/Console/InputDefinition/Argument.hh
index 2d650cb..bba1314 100644
--- a/src/Titon/Console/InputDefinition/Argument.hh
+++ b/src/Titon/Console/InputDefinition/Argument.hh
@@ -9,6 +9,10 @@ namespace Titon\Console\InputDefinition;
 
 class Argument extends AbstractInputDefinition {
 
+    public function getFormattedName(string $name): string {
+        return $name;
+    }
+
     public function setValue(string $value): this {
         $this->value = $value;
 
diff --git a/src/Titon/Console/bootstrap.hh b/src/Titon/Console/bootstrap.hh
index 794d986..b72d4e2 100644
--- a/src/Titon/Console/bootstrap.hh
+++ b/src/Titon/Console/bootstrap.hh
@@ -24,7 +24,4 @@ namespace Titon\Console {
         'value' => string
     );
     type CommandMap = Map<string, Command>;
-    type FlagMap = Map<string, Flag>;
-    type OptionMap = Map<string, Option>;
-    type ArgumentMap = Map<string, Argument>;
 }
diff --git a/tests/Titon/Console/CommandTest.hh b/tests/Titon/Console/CommandTest.hh
new file mode 100644
index 0000000..957149c
--- /dev/null
+++ b/tests/Titon/Console/CommandTest.hh
@@ -0,0 +1,39 @@
+<?hh
+
+use Titon\Test\TestCase;
+
+use Titon\Console\Arguments;
+use Titon\Console\InputDefinition\Flag;
+use Titon\Console\InputDefinition\Option;
+use Titon\Console\InputDefinition\Argument;
+
+class CommandTest extends TestCase {
+
+    public function testAddArguments() {
+        $args = new Arguments([
+            '-v'
+        ]);
+        $args->addFlag(new Flag('help', 'Show this help screen'));
+
+        $command = new TestCommand();
+        $command->setInput($args);
+        $command->configure();
+        $command->registerInput();
+
+        $args->parse();
+
+        $this->assertEquals(2, count($args->getFlags()));
+        $this->assertEquals(1, $args->getFlag('v')->getValue());
+    }
+}
+
+class TestCommand extends \Titon\Console\Command\AbstractCommand {
+
+    public function configure() {
+        $this->addFlag((new Flag('verbose', 'Set command verbosity'))->alias('v'));
+    }
+
+    public function run() {
+
+    }
+}
\ No newline at end of file

From 7b8ff199844cc9f8dea4b78f535aee5043f4e1fc Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Thu, 26 Feb 2015 19:12:12 -0500
Subject: [PATCH 07/92] renamed classes to make more sense (all arguments
 'Arguments' is now 'Input')

---
 src/Titon/Console/Command/AbstractCommand.hh  |  6 ++---
 src/Titon/Console/HelpScreen.hh               | 22 ++++++++++-------
 src/Titon/Console/{Arguments.hh => Input.hh}  | 14 +++++------
 .../{ArgumentLexer.hh => InputLexer.hh}       |  8 +++----
 src/Titon/Console/bootstrap.hh                |  6 +----
 tests/Titon/Console/CommandTest.hh            |  6 ++---
 .../{ArgumentParserTest.hh => ParserTest.hh}  | 24 +++++++++----------
 7 files changed, 43 insertions(+), 43 deletions(-)
 rename src/Titon/Console/{Arguments.hh => Input.hh} (92%)
 rename src/Titon/Console/{ArgumentLexer.hh => InputLexer.hh} (93%)
 rename tests/Titon/Console/{ArgumentParserTest.hh => ParserTest.hh} (91%)

diff --git a/src/Titon/Console/Command/AbstractCommand.hh b/src/Titon/Console/Command/AbstractCommand.hh
index 1ea7d06..37baf26 100644
--- a/src/Titon/Console/Command/AbstractCommand.hh
+++ b/src/Titon/Console/Command/AbstractCommand.hh
@@ -9,7 +9,7 @@ namespace Titon\Console\Command;
 
 use Titon\Console\ArgumentBag;
 use Titon\Console\Command;
-use Titon\Console\Arguments;
+use Titon\Console\Input;
 use Titon\Console\InputDefinition\Argument;
 use Titon\Console\InputDefinition\Flag;
 use Titon\Console\InputDefinition\Option;
@@ -18,7 +18,7 @@ abstract class AbstractCommand implements Command {
 
     protected ArgumentBag $arguments;
 
-    protected ?Arguments $input;
+    protected ?Input $input;
 
     protected ?string $description;
 
@@ -34,7 +34,7 @@ abstract class AbstractCommand implements Command {
         $this->options = new ArgumentBag();
     }
 
-    public function setInput(Arguments $input): this {
+    public function setInput(Input $input): this {
         $this->input = $input;
 
         return $this;
diff --git a/src/Titon/Console/HelpScreen.hh b/src/Titon/Console/HelpScreen.hh
index 2e3744d..56b156d 100644
--- a/src/Titon/Console/HelpScreen.hh
+++ b/src/Titon/Console/HelpScreen.hh
@@ -23,18 +23,16 @@ class HelpScreen {
 
     protected ?ArgumentBag $options;
 
-    public function __construct(string $name, string $description = '', ?Arguments $arguments = null) {
+    public function __construct(string $name, string $description = '', ?Input $input = null) {
         $this->name = $name;
         $this->description = $description;
 
-        if (is_null($arguments)) {
+        if (is_null($input)) {
             $this->arguments = new ArgumentBag();
             $this->flags = new ArgumentBag();
             $this->options = new ArgumentBag();
         } else {
-            $this->arguments = $arguments->getArguments();
-            $this->flags = $arguments->getFlags();
-            $this->options = $arguments->getOptions();
+            $this->setInput($input);
         }
     }
 
@@ -138,14 +136,14 @@ class HelpScreen {
         return join(" ", $usage);
     }
 
-    public function setCommand(Command $command): this {
-        $this->command = $command;
+    public function setArguments(Arguments $arguments): this {
+        $this->arguments = $arguments;
 
         return $this;
     }
 
-    public function setArguments(Arguments $arguments): this {
-        $this->arguments = $arguments;
+    public function setCommand(Command $command): this {
+        $this->command = $command;
 
         return $this;
     }
@@ -156,6 +154,12 @@ class HelpScreen {
         return $this;
     }
 
+    public function setInput(Input $input): this {
+        $this->arguments = $arguments->getArguments();
+        $this->flags = $arguments->getFlags();
+        $this->options = $arguments->getOptions();
+    }
+
     public function setOptions(ArgumentBag $options): this {
         $this->options = $options;
 
diff --git a/src/Titon/Console/Arguments.hh b/src/Titon/Console/Input.hh
similarity index 92%
rename from src/Titon/Console/Arguments.hh
rename to src/Titon/Console/Input.hh
index b2fd0fa..7371d66 100644
--- a/src/Titon/Console/Arguments.hh
+++ b/src/Titon/Console/Input.hh
@@ -13,7 +13,7 @@ use Titon\Console\InputDefinition\Flag;
 use Titon\Console\InputDefinition\Option;
 use Titon\Console\Exception\MissingValueException;
 
-class Arguments {
+class Input {
 
     protected ArgumentBag $arguments;
 
@@ -21,9 +21,9 @@ class Arguments {
 
     protected ArgumentBag $flags;
 
-    protected ArgumentLexer $input;
+    protected InputLexer $input;
 
-    protected Vector<string> $invalid = Vector {};
+    protected Vector<RawInput> $invalid = Vector {};
 
     protected ArgumentBag $options;
 
@@ -32,7 +32,7 @@ class Arguments {
             $args = array_slice($_SERVER['argv'], 1);
         }
 
-        $this->input = new ArgumentLexer($args);
+        $this->input = new InputLexer($args);
         $this->flags = new ArgumentBag();
         $this->options = new ArgumentBag();
         $this->arguments = new ArgumentBag();
@@ -114,7 +114,7 @@ class Arguments {
         }
     }
 
-    public function parseArgument(Input $key): bool {
+    public function parseArgument(RawInput $key): bool {
         foreach ($this->arguments as $argument) {
             if (is_null($argument->getValue())) {
                 $argument->setValue($key['raw']);
@@ -126,7 +126,7 @@ class Arguments {
         return false;
     }
 
-    public function parseFlag(Input $key): bool {
+    public function parseFlag(RawInput $key): bool {
         $key = $key['value'];
         if (is_null($flag = $this->flags->get($key))) {
             return false;
@@ -141,7 +141,7 @@ class Arguments {
         return true;
     }
 
-    public function parseOption(Input $key): bool {
+    public function parseOption(RawInput $key): bool {
         $key = $key['value'];
         if (is_null($option = $this->options->get($key))) {
             return false;
diff --git a/src/Titon/Console/ArgumentLexer.hh b/src/Titon/Console/InputLexer.hh
similarity index 93%
rename from src/Titon/Console/ArgumentLexer.hh
rename to src/Titon/Console/InputLexer.hh
index f70e1f4..3b4a3bc 100644
--- a/src/Titon/Console/ArgumentLexer.hh
+++ b/src/Titon/Console/InputLexer.hh
@@ -9,7 +9,7 @@ namespace Titon\Console;
 
 use Titon\Common\ArgumentList;
 
-class ArgumentLexer<Tv> implements Iterator<Tv> {
+class InputLexer<RawInput> implements Iterator<Tv> {
 
     public array<string> $items = array();
 
@@ -26,7 +26,7 @@ class ArgumentLexer<Tv> implements Iterator<Tv> {
         $this->length = count($items);
     }
 
-    public function current(): Tv {
+    public function current(): RawInput {
         return $this->current;
     }
 
@@ -71,7 +71,7 @@ class ArgumentLexer<Tv> implements Iterator<Tv> {
         }
     }
 
-    public function peek(): ?Input {
+    public function peek(): ?RawInput {
         if (!empty($this->items)) {
             return $this->processInput($this->items[0]);
         }
@@ -79,7 +79,7 @@ class ArgumentLexer<Tv> implements Iterator<Tv> {
         return null;
     }
 
-    public function processInput(string $input): Input {
+    public function processInput(string $input): RawInput {
         $raw = $input;
         $value = $input;
 
diff --git a/src/Titon/Console/bootstrap.hh b/src/Titon/Console/bootstrap.hh
index b72d4e2..abc7c8f 100644
--- a/src/Titon/Console/bootstrap.hh
+++ b/src/Titon/Console/bootstrap.hh
@@ -14,12 +14,8 @@
  */
 
 namespace Titon\Console {
-    use Titon\Console\Command;
-    use Titon\Console\InputDefinition\Flag;
-    use Titon\Console\InputDefinition\Option;
-    use Titon\Console\InputDefinition\Argument;
 
-    type Input = shape(
+    type RawInput = shape(
         'raw'   => string,
         'value' => string
     );
diff --git a/tests/Titon/Console/CommandTest.hh b/tests/Titon/Console/CommandTest.hh
index 957149c..0b8ed29 100644
--- a/tests/Titon/Console/CommandTest.hh
+++ b/tests/Titon/Console/CommandTest.hh
@@ -1,8 +1,8 @@
 <?hh
 
-use Titon\Test\TestCase;
+namespace Titon\Console;
 
-use Titon\Console\Arguments;
+use Titon\Test\TestCase;
 use Titon\Console\InputDefinition\Flag;
 use Titon\Console\InputDefinition\Option;
 use Titon\Console\InputDefinition\Argument;
@@ -10,7 +10,7 @@ use Titon\Console\InputDefinition\Argument;
 class CommandTest extends TestCase {
 
     public function testAddArguments() {
-        $args = new Arguments([
+        $args = new Input([
             '-v'
         ]);
         $args->addFlag(new Flag('help', 'Show this help screen'));
diff --git a/tests/Titon/Console/ArgumentParserTest.hh b/tests/Titon/Console/ParserTest.hh
similarity index 91%
rename from tests/Titon/Console/ArgumentParserTest.hh
rename to tests/Titon/Console/ParserTest.hh
index 63a34d1..6c041a9 100644
--- a/tests/Titon/Console/ArgumentParserTest.hh
+++ b/tests/Titon/Console/ParserTest.hh
@@ -1,8 +1,8 @@
 <?hh
 
-use Titon\Test\TestCase;
+namespace Titon\Console;
 
-use Titon\Console\Arguments;
+use Titon\Test\TestCase;
 use Titon\Console\InputDefinition\Flag;
 use Titon\Console\InputDefinition\Option;
 use Titon\Console\InputDefinition\Argument;
@@ -13,7 +13,7 @@ class ArgumentParserTest extends TestCase {
         /*
          * Check basic flag
          */
-        $args = new Arguments([
+        $args = new Input([
             '--foo',
         ]);
         $args->addFlag((new Flag('foo'))->alias('f'));
@@ -22,7 +22,7 @@ class ArgumentParserTest extends TestCase {
         $this->assertEquals(1, $args->getFlag('foo')->getValue());
         $this->assertEquals(1, $args->getFlag('f')->getValue());
 
-        $args = new Arguments([
+        $args = new Input([
             '-f',
         ]);
         $args->addFlag((new Flag('foo'))->alias('f'));
@@ -34,7 +34,7 @@ class ArgumentParserTest extends TestCase {
         /*
          * Check stacked, but different, flags
          */
-        $args = new Arguments([
+        $args = new Input([
             '-fb',
         ]);
         $args->addFlag((new Flag('foo'))->alias('f'));
@@ -47,7 +47,7 @@ class ArgumentParserTest extends TestCase {
         /*
          * Check stacked flag
          */
-        $args = new Arguments([
+        $args = new Input([
             '-vvv',
         ]);
         $args->addFlag((new Flag('v'))->setStackable(true));
@@ -57,7 +57,7 @@ class ArgumentParserTest extends TestCase {
     }
 
     public function testParseOptions() {
-        $args = new Arguments([
+        $args = new Input([
             '--name',
             'Alex Phillips',
         ]);
@@ -68,7 +68,7 @@ class ArgumentParserTest extends TestCase {
         $this->assertEquals('Alex Phillips', $args->getOption('name')->getValue());
         $this->assertEquals('Alex Phillips', $args->getOption('n')->getValue());
 
-        $args = new Arguments([
+        $args = new Input([
             '--name',
             'Alex Phillips',
         ]);
@@ -79,7 +79,7 @@ class ArgumentParserTest extends TestCase {
         $this->assertEquals('Alex Phillips', $args->getOption('name')->getValue());
         $this->assertEquals('Alex Phillips', $args->getOption('n')->getValue());
 
-        $args = new Arguments([
+        $args = new Input([
             '-n',
             'Alex Phillips',
         ]);
@@ -90,7 +90,7 @@ class ArgumentParserTest extends TestCase {
         $this->assertEquals('Alex Phillips', $args->getOption('name')->getValue());
         $this->assertEquals('Alex Phillips', $args->getOption('n')->getValue());
 
-        $args = new Arguments([
+        $args = new Input([
             '--name="Alex Phillips"',
         ]);
         $args->addOption((new Option('name'))->alias('n'));
@@ -102,7 +102,7 @@ class ArgumentParserTest extends TestCase {
     }
 
     public function testParseArguments() {
-        $args = new Arguments([
+        $args = new Input([
             'Alex Phillips',
         ]);
         $args->addArgument(new Argument('name'));
@@ -112,7 +112,7 @@ class ArgumentParserTest extends TestCase {
     }
 
     public function testMixedArguments() {
-        $args = new Arguments([
+        $args = new Input([
             'Alex Phillips',
             '-fb',
             '--baz="woot"',

From 617bd5857ed1496bb3d3507208114ec3635b5c28 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Thu, 26 Feb 2015 21:19:52 -0500
Subject: [PATCH 08/92] fixed most type checker issues

---
 src/Titon/Console/Command.hh                  | 14 +++++
 src/Titon/Console/Command/AbstractCommand.hh  | 39 +++++++++-----
 src/Titon/Console/HelpScreen.hh               | 53 ++++++++++++-------
 src/Titon/Console/Input.hh                    | 41 ++++++++------
 .../Console/{ArgumentBag.hh => InputBag.hh}   |  4 +-
 src/Titon/Console/InputDefinition/Option.hh   |  2 +
 src/Titon/Console/InputLexer.hh               | 22 +++++---
 7 files changed, 114 insertions(+), 61 deletions(-)
 rename src/Titon/Console/{ArgumentBag.hh => InputBag.hh} (75%)

diff --git a/src/Titon/Console/Command.hh b/src/Titon/Console/Command.hh
index 3ba3d3a..70dbf34 100644
--- a/src/Titon/Console/Command.hh
+++ b/src/Titon/Console/Command.hh
@@ -7,9 +7,23 @@
 
 namespace Titon\Console;
 
+use Titon\Console\InputDefinition\Argument;
+use Titon\Console\InputDefinition\Flag;
+use Titon\Console\InputDefinition\Option;
+
 interface Command {
 
     public function configure(): void;
 
+    public function getArguments(): InputBag<Argument>;
+
+    public function getDescription(): string;
+
+    public function getFlags(): InputBag<Flag>;
+
+    public function getName(): string;
+
+    public function getOptions(): InputBag<Option>;
+
     public function run(): void;
 }
\ No newline at end of file
diff --git a/src/Titon/Console/Command/AbstractCommand.hh b/src/Titon/Console/Command/AbstractCommand.hh
index 37baf26..9ccfc7a 100644
--- a/src/Titon/Console/Command/AbstractCommand.hh
+++ b/src/Titon/Console/Command/AbstractCommand.hh
@@ -7,7 +7,7 @@
 
 namespace Titon\Console\Command;
 
-use Titon\Console\ArgumentBag;
+use Titon\Console\InputBag;
 use Titon\Console\Command;
 use Titon\Console\Input;
 use Titon\Console\InputDefinition\Argument;
@@ -16,22 +16,23 @@ use Titon\Console\InputDefinition\Option;
 
 abstract class AbstractCommand implements Command {
 
-    protected ArgumentBag $arguments;
+    protected InputBag<Argument> $arguments;
 
-    protected ?Input $input;
+    protected Input $input;
 
-    protected ?string $description;
+    protected string $description;
 
-    protected ArgumentBag $flags;
+    protected InputBag<Flag> $flags;
 
     protected string $name;
 
-    protected ArgumentBag $options;
+    protected InputBag<Option> $options;
 
     public function __construct() {
-        $this->arguments = new ArgumentBag();
-        $this->flags = new ArgumentBag();
-        $this->options = new ArgumentBag();
+        $this->input = new Input();
+        $this->arguments = new InputBag();
+        $this->flags = new InputBag();
+        $this->options = new InputBag();
     }
 
     public function setInput(Input $input): this {
@@ -58,7 +59,7 @@ abstract class AbstractCommand implements Command {
         return $this;
     }
 
-    protected function getArgument(string $key): ?string {
+    protected function getArgument(string $key): mixed {
         if ($argument = $this->input->getArgument($key)) {
             return $argument->getValue();
         }
@@ -66,10 +67,14 @@ abstract class AbstractCommand implements Command {
         return null;
     }
 
-    protected function getArguments(): ArgumentBag {
+    public function getArguments(): InputBag<Argument> {
         return $this->arguments;
     }
 
+    public function getDescription(): string {
+        return $this->description;
+    }
+
     protected function getFlag(string $key): ?int {
         if ($flag = $this->input->getFlag($key)) {
             return $flag->getValue();
@@ -78,11 +83,15 @@ abstract class AbstractCommand implements Command {
         return null;
     }
 
-    protected function getFlags(): ArgumentBag {
+    public function getFlags(): InputBag<Flag> {
         return $this->flags;
     }
 
-    protected function getOption(string $key): ?string {
+    public function getName(): string {
+        return $this->name;
+    }
+
+    protected function getOption(string $key): mixed {
         if ($option = $this->input->getOption($key)) {
             return $option->getValue();
         }
@@ -90,7 +99,7 @@ abstract class AbstractCommand implements Command {
         return null;
     }
 
-    protected function getOptions(): ArgumentBag {
+    public function getOptions(): InputBag<Option> {
         return $this->options;
     }
 
@@ -104,5 +113,7 @@ abstract class AbstractCommand implements Command {
         foreach ($this->options as $name => $option) {
             $this->input->addOption($option);
         }
+
+        return $this;
     }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/HelpScreen.hh b/src/Titon/Console/HelpScreen.hh
index 56b156d..ad6ebf8 100644
--- a/src/Titon/Console/HelpScreen.hh
+++ b/src/Titon/Console/HelpScreen.hh
@@ -7,32 +7,37 @@
 
 namespace Titon\Console;
 
+use Titon\Console\InputDefinition\Argument;
+use Titon\Console\InputDefinition\Flag;
+use Titon\Console\InputDefinition\Option;
 use Titon\Console\InputDefinition\AbstractInputDefinition;
 
 class HelpScreen {
 
-    protected ?ArgumentBag $arguments;
+    protected InputBag<Argument> $arguments;
 
     protected ?Command $command;
 
     protected string $description;
 
-    protected ?ArgumentBag $flags;
+    protected InputBag<Flag> $flags;
 
     protected string $name;
 
-    protected ?ArgumentBag $options;
+    protected InputBag<Option> $options;
 
     public function __construct(string $name, string $description = '', ?Input $input = null) {
         $this->name = $name;
         $this->description = $description;
 
         if (is_null($input)) {
-            $this->arguments = new ArgumentBag();
-            $this->flags = new ArgumentBag();
-            $this->options = new ArgumentBag();
+            $this->arguments = new InputBag();
+            $this->flags = new InputBag();
+            $this->options = new InputBag();
         } else {
-            $this->setInput($input);
+            $this->arguments = $input->getArguments();
+            $this->flags = $input->getFlags();
+            $this->options = $input->getOptions();
         }
     }
 
@@ -60,7 +65,7 @@ class HelpScreen {
         return join($retval, "\n\n");
     }
 
-    protected function renderSection(ArgumentBag $arguments): string {
+    protected function renderSection(InputBag $arguments): string {
         $entries = Map {};
         foreach ($arguments as $argument) {
             $name = $argument->getFormattedName($argument->getName());
@@ -70,7 +75,8 @@ class HelpScreen {
             $entries[$name] = $argument->getDescription();
         }
 
-        $maxLength = max(array_map('strlen', $entries->keys()));
+        $keys = $entries->keys()->toArray();
+        $maxLength = max(array_map('strlen', $keys));
         $descriptionLength = 80 - 4 - $maxLength;
 
         $output = Vector {};
@@ -81,7 +87,7 @@ class HelpScreen {
 
             $pad = str_repeat(' ', $maxLength + 4);
             while ($desc = array_shift($description)) {
-                $formatted .= "\n${pad}${desc}";
+                $formatted .= "\n$pad$desc";
             }
 
             $formatted = "$formatted";
@@ -95,15 +101,20 @@ class HelpScreen {
     protected function renderUsage(): string {
         $usage = Vector {};
         if (!is_null($this->command)) {
-            $usage[] = $this->command->getName();
+            $command = $this->command;
 
-            foreach ($this->command->getArguments() as $argument) {
+            // Setting local variable and `invariant`ing it to quiet type checker
+            invariant(!is_null($command), "Must be a Command.");
+
+            $usage[] = $command->getName();
+
+            foreach ($command->getArguments() as $argument) {
                 $arg = $argument->getName();
                 if ($argument->getMode() === AbstractInputDefinition::VALUE_OPTIONAL) {
                     $usage[] = "[$arg]";
                 }
             }
-            foreach ($this->command->getArguments() as $argument) {
+            foreach ($command->getArguments() as $argument) {
                 $arg = $argument->getName();
                 if ($argument->getAlias()) {
                     $arg = "$arg|{$argument->getAlias()}";
@@ -112,7 +123,7 @@ class HelpScreen {
                     $usage[] = "[$arg]";
                 }
             }
-            foreach ($this->command->getArguments() as $argument) {
+            foreach ($command->getArguments() as $argument) {
                 $arg = $argument->getName();
                 if ($argument->getAlias()) {
                     $arg = "$arg|{$argument->getAlias()}";
@@ -136,7 +147,7 @@ class HelpScreen {
         return join(" ", $usage);
     }
 
-    public function setArguments(Arguments $arguments): this {
+    public function setArguments(InputBag<Argument> $arguments): this {
         $this->arguments = $arguments;
 
         return $this;
@@ -148,19 +159,21 @@ class HelpScreen {
         return $this;
     }
 
-    public function setFlags(ArgumentBag $flags): this {
+    public function setFlags(InputBag<Flag> $flags): this {
         $this->flags = $flags;
 
         return $this;
     }
 
     public function setInput(Input $input): this {
-        $this->arguments = $arguments->getArguments();
-        $this->flags = $arguments->getFlags();
-        $this->options = $arguments->getOptions();
+        $this->arguments = $input->getArguments();
+        $this->flags = $input->getFlags();
+        $this->options = $input->getOptions();
+
+        return $this;
     }
 
-    public function setOptions(ArgumentBag $options): this {
+    public function setOptions(InputBag<Option> $options): this {
         $this->options = $options;
 
         return $this;
diff --git a/src/Titon/Console/Input.hh b/src/Titon/Console/Input.hh
index 7371d66..5bdd560 100644
--- a/src/Titon/Console/Input.hh
+++ b/src/Titon/Console/Input.hh
@@ -15,27 +15,27 @@ use Titon\Console\Exception\MissingValueException;
 
 class Input {
 
-    protected ArgumentBag $arguments;
+    protected InputBag<Argument> $arguments;
 
     protected CommandMap $commands = Map {};
 
-    protected ArgumentBag $flags;
+    protected InputBag<Flag> $flags;
 
     protected InputLexer $input;
 
     protected Vector<RawInput> $invalid = Vector {};
 
-    protected ArgumentBag $options;
+    protected InputBag<Option> $options;
 
-    public function __construct(?ArgumentList $args = null) {
+    public function __construct(?array<string> $args = null) {
         if (is_null($args)) {
             $args = array_slice($_SERVER['argv'], 1);
         }
 
         $this->input = new InputLexer($args);
-        $this->flags = new ArgumentBag();
-        $this->options = new ArgumentBag();
-        $this->arguments = new ArgumentBag();
+        $this->flags = new InputBag();
+        $this->options = new InputBag();
+        $this->arguments = new InputBag();
     }
 
     public function addArgument(Argument $argument): this {
@@ -64,7 +64,7 @@ class Input {
         return null;
     }
 
-    public function getArguments(): ArgumentBag {
+    public function getArguments(): InputBag<Argument> {
         return $this->arguments;
     }
 
@@ -82,7 +82,7 @@ class Input {
         return null;
     }
 
-    public function getFlags(): ArgumentBag {
+    public function getFlags(): InputBag<Flag> {
         return $this->flags;
     }
 
@@ -94,11 +94,11 @@ class Input {
         return null;
     }
 
-    public function getOptions(): ArgumentBag {
+    public function getOptions(): InputBag<Option> {
         return $this->options;
     }
 
-    public function parse() {
+    public function parse(): void {
         foreach ($this->input as $val) {
             if ($this->parseFlag($val)) {
                 continue;
@@ -114,7 +114,7 @@ class Input {
         }
     }
 
-    public function parseArgument(RawInput $key): bool {
+    protected function parseArgument(RawInput $key): bool {
         foreach ($this->arguments as $argument) {
             if (is_null($argument->getValue())) {
                 $argument->setValue($key['raw']);
@@ -126,29 +126,36 @@ class Input {
         return false;
     }
 
-    public function parseFlag(RawInput $key): bool {
+    protected function parseFlag(RawInput $key): bool {
         $key = $key['value'];
         if (is_null($flag = $this->flags->get($key))) {
             return false;
         }
 
-        if ($this->flags->get($key)->isStackable()) {
-            $this->flags->get($key)->increaseValue();
+        invariant($flag instanceof Flag, "Must be a Flag.");
+
+        if ($flag->isStackable()) {
+            $flag->increaseValue();
         } else {
-            $this->flags->get($key)->setValue(1);
+            $flag->setValue(1);
         }
 
         return true;
     }
 
-    public function parseOption(RawInput $key): bool {
+    protected function parseOption(RawInput $key): bool {
         $key = $key['value'];
         if (is_null($option = $this->options->get($key))) {
             return false;
         }
 
+        invariant(!is_null($option), "Must not be null.");
+
         // Peak ahead to make sure we get a value.
         $nextValue = $this->input->peek();
+
+        invariant(!is_null($nextValue), "Must be RawInput.");
+
         if (!$this->input->end() && $this->input->isArgument($nextValue['raw'])) {
             throw new MissingValueException("No value is present for option $key");
         }
diff --git a/src/Titon/Console/ArgumentBag.hh b/src/Titon/Console/InputBag.hh
similarity index 75%
rename from src/Titon/Console/ArgumentBag.hh
rename to src/Titon/Console/InputBag.hh
index c99a1c4..da7d8d7 100644
--- a/src/Titon/Console/ArgumentBag.hh
+++ b/src/Titon/Console/InputBag.hh
@@ -9,9 +9,9 @@ namespace Titon\Console;
 
 use Titon\Common\Bag\AbstractBag;
 
-class ArgumentBag extends AbstractBag<string, InputDefinition> {
+class InputBag<Tv> extends AbstractBag<string, Tv> {
 
-    public function get(string $key, ?InputDefinition $default = null): ?InputDefinition {
+    public function get(string $key, ?Tv $default = null): ?Tv {
         $arg = null;
         if (is_null($arg = parent::get($key))) {
             foreach ($this as $val) {
diff --git a/src/Titon/Console/InputDefinition/Option.hh b/src/Titon/Console/InputDefinition/Option.hh
index 9bf6db4..4cae742 100644
--- a/src/Titon/Console/InputDefinition/Option.hh
+++ b/src/Titon/Console/InputDefinition/Option.hh
@@ -25,5 +25,7 @@ class Option extends AbstractInputDefinition {
 
     public function setValue(string $value): this {
         $this->value = $value;
+
+        return $this;
     }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/InputLexer.hh b/src/Titon/Console/InputLexer.hh
index 3b4a3bc..3e7c69b 100644
--- a/src/Titon/Console/InputLexer.hh
+++ b/src/Titon/Console/InputLexer.hh
@@ -9,21 +9,25 @@ namespace Titon\Console;
 
 use Titon\Common\ArgumentList;
 
-class InputLexer<RawInput> implements Iterator<Tv> {
+class InputLexer implements Iterator<RawInput> {
 
-    public array<string> $items = array();
+    public array<string> $items;
 
     protected int $position = 0;
 
     protected int $length = 0;
 
-    protected ?string $current;
+    protected RawInput $current;
 
     protected bool $first = true;
 
-    public function __construct(ArgumentList $items) {
+    public function __construct(array<string> $items) {
         $this->items = $items;
         $this->length = count($items);
+        $this->current = shape(
+            'value' => '',
+            'raw'   => ''
+        );
     }
 
     public function current(): RawInput {
@@ -36,13 +40,15 @@ class InputLexer<RawInput> implements Iterator<Tv> {
 
     private function explode(): void {
         if (!$this->isShort($this->current['raw']) || strlen($this->current['value']) <= 1) {
-            return false;
+            return;
         }
 
         $exploded = str_split($this->current['value']);
 
-        $this->current['value'] = array_pop($exploded);
-        $this->current['raw'] = '-' . $this->current['value'];
+        $this->current = shape(
+            'value' => array_pop($exploded),
+            'raw'   => '-' . $this->current['value']
+        );
 
         foreach ($exploded as $piece) {
             $this->unshift('-' . $piece);
@@ -72,7 +78,7 @@ class InputLexer<RawInput> implements Iterator<Tv> {
     }
 
     public function peek(): ?RawInput {
-        if (!empty($this->items)) {
+        if (count($this->items) > 0) {
             return $this->processInput($this->items[0]);
         }
 

From 47171daa4a80ca6d1a53bd09dbde7d70cfc30aef Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Thu, 26 Feb 2015 21:21:42 -0500
Subject: [PATCH 09/92] fixed formatting issue

---
 src/Titon/Console/Command/AbstractCommand.hh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Titon/Console/Command/AbstractCommand.hh b/src/Titon/Console/Command/AbstractCommand.hh
index 9ccfc7a..77e3f1b 100644
--- a/src/Titon/Console/Command/AbstractCommand.hh
+++ b/src/Titon/Console/Command/AbstractCommand.hh
@@ -47,13 +47,13 @@ abstract class AbstractCommand implements Command {
         return $this;
     }
 
-        public function addFlag(Flag $flag): this {
+    public function addFlag(Flag $flag): this {
         $this->flags->set($flag->getName(), $flag);
 
         return $this;
     }
 
-        public function addOption(Option $option): this {
+    public function addOption(Option $option): this {
         $this->options->set($option->getName(), $option);
 
         return $this;

From dd518e8a7e4d8881e4bc25f301cb0d9d0fbd80c3 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Thu, 26 Feb 2015 21:25:15 -0500
Subject: [PATCH 10/92] another type checker fix

---
 src/Titon/Console/HelpScreen.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Titon/Console/HelpScreen.hh b/src/Titon/Console/HelpScreen.hh
index ad6ebf8..ee151eb 100644
--- a/src/Titon/Console/HelpScreen.hh
+++ b/src/Titon/Console/HelpScreen.hh
@@ -65,7 +65,7 @@ class HelpScreen {
         return join($retval, "\n\n");
     }
 
-    protected function renderSection(InputBag $arguments): string {
+    protected function renderSection<T as InputDefinition>(InputBag<T> $arguments): string {
         $entries = Map {};
         foreach ($arguments as $argument) {
             $name = $argument->getFormattedName($argument->getName());

From 80bbd096d20f56d7d9044858c414a4d85ad0f598 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Thu, 26 Feb 2015 22:01:19 -0500
Subject: [PATCH 11/92] type checker fixes!

---
 src/Titon/Console/HelpScreen.hh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Titon/Console/HelpScreen.hh b/src/Titon/Console/HelpScreen.hh
index ee151eb..5e07707 100644
--- a/src/Titon/Console/HelpScreen.hh
+++ b/src/Titon/Console/HelpScreen.hh
@@ -75,8 +75,9 @@ class HelpScreen {
             $entries[$name] = $argument->getDescription();
         }
 
-        $keys = $entries->keys()->toArray();
-        $maxLength = max(array_map('strlen', $keys));
+        $maxLength = max(array_map(function(string $key): int {
+            return strlen($key);
+        }, $entries->keys()->toArray()));
         $descriptionLength = 80 - 4 - $maxLength;
 
         $output = Vector {};

From 356dbd36a36de95215237e11571c9dacc1d3a554 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Thu, 26 Feb 2015 22:01:28 -0500
Subject: [PATCH 12/92] just making it more strict

---
 src/Titon/Console/InputBag.hh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Titon/Console/InputBag.hh b/src/Titon/Console/InputBag.hh
index da7d8d7..a2c6495 100644
--- a/src/Titon/Console/InputBag.hh
+++ b/src/Titon/Console/InputBag.hh
@@ -9,9 +9,9 @@ namespace Titon\Console;
 
 use Titon\Common\Bag\AbstractBag;
 
-class InputBag<Tv> extends AbstractBag<string, Tv> {
+class InputBag<T as InputDefinition> extends AbstractBag<string, T> {
 
-    public function get(string $key, ?Tv $default = null): ?Tv {
+    public function get(string $key, ?T $default = null): ?T {
         $arg = null;
         if (is_null($arg = parent::get($key))) {
             foreach ($this as $val) {

From a515019dfe4c188e772a2283bf62fdb10f71a926 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Fri, 27 Feb 2015 17:34:00 -0500
Subject: [PATCH 13/92] started documentation, added commands to help screen

---
 src/Titon/Console/Command/AbstractCommand.hh |  24 +++-
 src/Titon/Console/HelpScreen.hh              | 120 +++++++++++++---
 src/Titon/Console/Input.hh                   | 144 +++++++++++++++----
 src/Titon/Console/composer.json              |   4 +-
 4 files changed, 241 insertions(+), 51 deletions(-)

diff --git a/src/Titon/Console/Command/AbstractCommand.hh b/src/Titon/Console/Command/AbstractCommand.hh
index 77e3f1b..1b3e79f 100644
--- a/src/Titon/Console/Command/AbstractCommand.hh
+++ b/src/Titon/Console/Command/AbstractCommand.hh
@@ -35,12 +35,6 @@ abstract class AbstractCommand implements Command {
         $this->options = new InputBag();
     }
 
-    public function setInput(Input $input): this {
-        $this->input = $input;
-
-        return $this;
-    }
-
     public function addArgument(Argument $argument): this {
         $this->arguments->set($argument->getName(), $argument);
 
@@ -116,4 +110,22 @@ abstract class AbstractCommand implements Command {
 
         return $this;
     }
+
+    public function setDescription(string $description): this {
+        $this->description = $description;
+
+        return $this;
+    }
+
+    public function setInput(Input $input): this {
+        $this->input = $input;
+
+        return $this;
+    }
+
+    public function setName(string $name): this {
+        $this->name = $name;
+
+        return $this;
+    }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/HelpScreen.hh b/src/Titon/Console/HelpScreen.hh
index 5e07707..46a6b90 100644
--- a/src/Titon/Console/HelpScreen.hh
+++ b/src/Titon/Console/HelpScreen.hh
@@ -18,32 +18,26 @@ class HelpScreen {
 
     protected ?Command $command;
 
-    protected string $description;
+    protected CommandMap $commands;
 
     protected InputBag<Flag> $flags;
 
-    protected string $name;
+    protected ?string $name;
 
     protected InputBag<Option> $options;
 
-    public function __construct(string $name, string $description = '', ?Input $input = null) {
-        $this->name = $name;
-        $this->description = $description;
-
-        if (is_null($input)) {
-            $this->arguments = new InputBag();
-            $this->flags = new InputBag();
-            $this->options = new InputBag();
-        } else {
-            $this->arguments = $input->getArguments();
-            $this->flags = $input->getFlags();
-            $this->options = $input->getOptions();
-        }
+    public function __construct(Input $input) {
+        $this->commands = $input->getCommands();
+        $this->arguments = $input->getArguments();
+        $this->flags = $input->getFlags();
+        $this->options = $input->getOptions();
     }
 
     public function render(): string {
         $retval = Vector {};
 
+        $retval[] = $this->renderHeading();
+
         $retval[] = $this->renderUsage();
 
         if (!$this->arguments->all()->isEmpty()) {
@@ -61,10 +55,89 @@ class HelpScreen {
                 $retval[] = "Options\n$output";
             }
         }
+        if (is_null($this->command)) {
+            if (!$this->commands->isEmpty()) {
+                $retval[] = $this->renderCommands();
+            }
+        }
 
         return join($retval, "\n\n");
     }
 
+    protected function renderCommands(): string {
+        ksort($this->commands);
+
+        $maxLength = max(array_map(function(string $key): int {
+            $indentation = substr_count($key, ':');
+            $key = str_repeat('  ', $indentation) . $key;
+
+            return strlen($key);
+        }, $this->commands->keys()));
+        $descriptionLength = 80 - 4 - $maxLength;
+
+        $output = Vector {};
+        $nestedNames = Vector {};
+        foreach ($this->commands as $name => $command) {
+            $nested = explode(':', $name);
+            array_pop($nested);
+
+            if (count($nested) > 0) {
+                $nest = '';
+                foreach ($nested as $piece) {
+                    $nest = $nest ? ":$piece" : $piece;
+
+                    if ($nestedNames->linearSearch($nest) < 0) {
+                        // If we get here, then we need to list the name, but it isn't
+                        // actually a command, so subtract substr_count by 1.
+                        $nestedNames[] = $nest;
+
+                        $indentation = substr_count($name, ':') - 1;
+                        $output[] = str_repeat('  ', $indentation) . str_pad($nest, $maxLength);
+                    }
+                }
+            } else {
+                $nestedNames[] = $name;
+            }
+
+            $indentation = substr_count($name, ':');
+            $formatted = str_repeat('  ', $indentation) . str_pad($name, $maxLength - (2 * $indentation));
+
+            $description = explode('{{BREAK}}', wordwrap($command->getDescription(), $descriptionLength, "{{BREAK}}"));
+            $formatted .= '  ' . array_shift($description);
+
+            $pad = str_repeat(' ', $maxLength + 4);
+            while ($desc = array_shift($description)) {
+                $formatted .= "\n$pad$desc";
+            }
+
+            $formatted = "$formatted";
+
+            array_push($output, $formatted);
+        }
+
+        return join($output, "\n");
+    }
+
+    protected function renderHeading(): string {
+        $retval = '';
+
+        if (!is_null($this->command)) {
+            $command = $this->command;
+
+            invariant(!is_null($command), "Must be a command.");
+
+            if ($description = $command->getDescription()) {
+                $retval = $command->getName() . ' - ' . $description;
+            } else {
+                $retval = $command->getName();
+            }
+        } else if (!is_null($this->name)) {
+            $retval = $this->name;
+        }
+
+        return $retval;
+    }
+
     protected function renderSection<T as InputDefinition>(InputBag<T> $arguments): string {
         $entries = Map {};
         foreach ($arguments as $argument) {
@@ -77,7 +150,7 @@ class HelpScreen {
 
         $maxLength = max(array_map(function(string $key): int {
             return strlen($key);
-        }, $entries->keys()->toArray()));
+        }, $entries->keys()));
         $descriptionLength = 80 - 4 - $maxLength;
 
         $output = Vector {};
@@ -145,7 +218,7 @@ class HelpScreen {
             }
         }
 
-        return join(" ", $usage);
+        return "Usage\n  " . join(" ", $usage);
     }
 
     public function setArguments(InputBag<Argument> $arguments): this {
@@ -160,6 +233,12 @@ class HelpScreen {
         return $this;
     }
 
+    public function setCommands(CommandMap $commands): this {
+        $this->commands = $commands;
+
+        return $this;
+    }
+
     public function setFlags(InputBag<Flag> $flags): this {
         $this->flags = $flags;
 
@@ -167,6 +246,7 @@ class HelpScreen {
     }
 
     public function setInput(Input $input): this {
+        $this->commands = $input->getCommands();
         $this->arguments = $input->getArguments();
         $this->flags = $input->getFlags();
         $this->options = $input->getOptions();
@@ -174,6 +254,12 @@ class HelpScreen {
         return $this;
     }
 
+    public function setName(string $name): this {
+        $this->name = $name;
+
+        return $this;
+    }
+
     public function setOptions(InputBag<Option> $options): this {
         $this->options = $options;
 
diff --git a/src/Titon/Console/Input.hh b/src/Titon/Console/Input.hh
index 5bdd560..5448191 100644
--- a/src/Titon/Console/Input.hh
+++ b/src/Titon/Console/Input.hh
@@ -8,11 +8,13 @@
 namespace Titon\Console;
 
 use Titon\Common\ArgumentList;
+use Titon\Utility\State\Server;
 use Titon\Console\InputDefinition\Argument;
 use Titon\Console\InputDefinition\Flag;
 use Titon\Console\InputDefinition\Option;
 use Titon\Console\Exception\MissingValueException;
 
+
 class Input {
 
     protected InputBag<Argument> $arguments;
@@ -27,9 +29,14 @@ class Input {
 
     protected InputBag<Option> $options;
 
+    /**
+     * Construct a new instance of Input
+     *
+     * @param ?array<mixed> $args
+     */
     public function __construct(?array<string> $args = null) {
         if (is_null($args)) {
-            $args = array_slice($_SERVER['argv'], 1);
+            $args = array_slice(Server::get('argv'), 1);
         }
 
         $this->input = new InputLexer($args);
@@ -38,66 +45,125 @@ class Input {
         $this->arguments = new InputBag();
     }
 
+    /**
+     * Add a new `Argument` candidate to be parsed from input.
+     *
+     * @param Argument $argument
+     *
+     * @return $this
+     */
     public function addArgument(Argument $argument): this {
         $this->arguments->set($argument->getName(), $argument);
 
         return $this;
     }
 
+    public function addCommand(Command $command): this {
+        $command->configure();
+        $this->commands[$command->getName()] = $command;
+
+        return $this;
+    }
+
+    /**
+     * Add a new `Flag` candidate to be parsed from input.
+     *
+     * @param Flag $flag
+     *
+     * @return $this
+     */
     public function addFlag(Flag $flag): this {
         $this->flags->set($flag->getName(), $flag);
 
         return $this;
     }
 
+    /**
+     * Add a new `Option` candidate to be parsed from input.
+     *
+     * @param Option $option
+     *
+     * @return $this
+     */
     public function addOption(Option $option): this {
         $this->options->set($option->getName(), $option);
 
         return $this;
     }
 
+    /**
+     * Retrieve an `Argument` by its key or alias. Returns null if none exists.
+     *
+     * @param string $key The key or alias of the `Argument`
+     *
+     * @return Argument|null
+     */
     public function getArgument(string $key): ?Argument {
-        if (!is_null($argument = $this->arguments->get($key))) {
-            return $argument;
-        }
-
-        return null;
+        return $this->arguments->get($key);
     }
 
+    /**
+     * Retrieve all `Argument` candidates.
+     *
+     * @return InputBag<Argument>
+     */
     public function getArguments(): InputBag<Argument> {
         return $this->arguments;
     }
 
-    public function getFlag(string $key): ?Flag {
-        if (!is_null($flag = $this->flags->get($key))) {
-            return $flag;
-        }
+    public function getCommand(string $key): ?Command {
+        return $this->commands->get($key);
+    }
 
-        foreach ($this->flags as $flag) {
-            if ($key === $flag->getName() || $key === $flag->getAlias()) {
-                return $flag;
-            }
-        }
+    public function getCommands(): CommandMap {
+        return $this->commands;
+    }
 
-        return null;
+    /**
+     * Retrieve a `Flag` by its key or alias. Returns null if none exists.
+     *
+     * @param string $key The key or alias of the `Flag`
+     *
+     * @return Flag|null
+     */
+    public function getFlag(string $key): ?Flag {
+        return $this->flags->get($key);
     }
 
+    /**
+     * Retrieve all `Flag` candidates.
+     *
+     * @return InputBag<Flag>
+     */
     public function getFlags(): InputBag<Flag> {
         return $this->flags;
     }
 
+    /**
+     * Retrieve an `Option` by its key or alias. Returns null if none exists.
+     *
+     * @param string $key The key or alias of the `Option`
+     *
+     * @return Option|null
+     */
     public function getOption(string $key): ?Option {
-        if (!is_null($option = $this->options->get($key))) {
-            return $option;
-        }
-
-        return null;
+        return $this->options->get($key);
     }
 
+    /**
+     * Retrieve all `Option` candidates.
+     *
+     * @return InputBag<Option>
+     */
     public function getOptions(): InputBag<Option> {
         return $this->options;
     }
 
+    /**
+     * Parse input for all `Flag`, `Option`, and `Argument` candidates.
+     *
+     * @return void
+     */
     public function parse(): void {
         foreach ($this->input as $val) {
             if ($this->parseFlag($val)) {
@@ -114,10 +180,18 @@ class Input {
         }
     }
 
-    protected function parseArgument(RawInput $key): bool {
+    /**
+     * Determine if a RawInput matches an `Argument` candidate. If so, save its
+     * value.
+     *
+     * @param RawInput $key
+     *
+     * @return bool
+     */
+    protected function parseArgument(RawInput $input): bool {
         foreach ($this->arguments as $argument) {
             if (is_null($argument->getValue())) {
-                $argument->setValue($key['raw']);
+                $argument->setValue($input['raw']);
 
                 return true;
             }
@@ -126,8 +200,16 @@ class Input {
         return false;
     }
 
-    protected function parseFlag(RawInput $key): bool {
-        $key = $key['value'];
+    /**
+     * Determine if a RawInput matches a `Flag` candidate. If so, save its
+     * value.
+     *
+     * @param RawInput $key
+     *
+     * @return bool
+     */
+    protected function parseFlag(RawInput $input): bool {
+        $key = $input['value'];
         if (is_null($flag = $this->flags->get($key))) {
             return false;
         }
@@ -143,8 +225,16 @@ class Input {
         return true;
     }
 
-    protected function parseOption(RawInput $key): bool {
-        $key = $key['value'];
+    /**
+     * Determine if a RawInput matches an `Option` candidate. If so, save its
+     * value.
+     *
+     * @param RawInput $key
+     *
+     * @return bool
+     */
+    protected function parseOption(RawInput $input): bool {
+        $key = $input['value'];
         if (is_null($option = $this->options->get($key))) {
             return false;
         }
diff --git a/src/Titon/Console/composer.json b/src/Titon/Console/composer.json
index 375ddc5..cf8a5da 100644
--- a/src/Titon/Console/composer.json
+++ b/src/Titon/Console/composer.json
@@ -20,7 +20,9 @@
     "source": "https://github.com/titon/console"
   },
   "require": {
-    "hhvm": ">=3.4.0"
+    "hhvm": ">=3.4.0",
+    "titon/common": "*",
+    "titon/utility": "*",
   },
   "autoload": {
     "psr-4": {

From 4e528eac2ed2fe50354f553377d3bbef176678ca Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Fri, 27 Feb 2015 19:25:38 -0500
Subject: [PATCH 14/92] adjusted parser so that the first argument read in is
 always the command

---
 .../Exception/InvalidCommandException.hh      |  19 +++
 src/Titon/Console/Input.hh                    |  20 +++
 src/Titon/Console/InputDefinition.hh          |   2 +
 tests/Titon/Console/CommandTest.hh            |  16 +-
 tests/Titon/Console/ParserTest.hh             | 150 ++++++++++--------
 tests/Titon/Test/Stub/Console/CommandStub.hh  |  17 ++
 6 files changed, 146 insertions(+), 78 deletions(-)
 create mode 100644 src/Titon/Console/Exception/InvalidCommandException.hh
 create mode 100644 tests/Titon/Test/Stub/Console/CommandStub.hh

diff --git a/src/Titon/Console/Exception/InvalidCommandException.hh b/src/Titon/Console/Exception/InvalidCommandException.hh
new file mode 100644
index 0000000..18ccf85
--- /dev/null
+++ b/src/Titon/Console/Exception/InvalidCommandException.hh
@@ -0,0 +1,19 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\Exception;
+
+use RuntimeException;
+
+/**
+ * Exception thrown when the command used in the application doesn't exist.
+ *
+ * @package Titon\Context\Exception
+ */
+class InvalidCommandException extends RuntimeException {
+
+}
diff --git a/src/Titon/Console/Input.hh b/src/Titon/Console/Input.hh
index 5448191..81478df 100644
--- a/src/Titon/Console/Input.hh
+++ b/src/Titon/Console/Input.hh
@@ -13,12 +13,15 @@ use Titon\Console\InputDefinition\Argument;
 use Titon\Console\InputDefinition\Flag;
 use Titon\Console\InputDefinition\Option;
 use Titon\Console\Exception\MissingValueException;
+use Titon\Console\Exception\InvalidCommandException;
 
 
 class Input {
 
     protected InputBag<Argument> $arguments;
 
+    protected ?Command $command;
+
     protected CommandMap $commands = Map {};
 
     protected InputBag<Flag> $flags;
@@ -139,6 +142,12 @@ class Input {
         return $this->flags;
     }
 
+    public function setInput(array<string> $args): this {
+        $this->input = new InputLexer($args);
+
+        return $this;
+    }
+
     /**
      * Retrieve an `Option` by its key or alias. Returns null if none exists.
      *
@@ -189,6 +198,17 @@ class Input {
      * @return bool
      */
     protected function parseArgument(RawInput $input): bool {
+        // The first `argument` parsed needs to be a valid command
+        if (is_null($this->command)) {
+            if (!$this->commands->contains($input['raw'])) {
+                throw new InvalidCommandException("Command `{$input['raw']}` is not a valid command.");
+            }
+
+            $this->command = $this->commands->get($input['raw']);
+
+            return true;
+        }
+
         foreach ($this->arguments as $argument) {
             if (is_null($argument->getValue())) {
                 $argument->setValue($input['raw']);
diff --git a/src/Titon/Console/InputDefinition.hh b/src/Titon/Console/InputDefinition.hh
index a55e3d2..ae77136 100644
--- a/src/Titon/Console/InputDefinition.hh
+++ b/src/Titon/Console/InputDefinition.hh
@@ -9,6 +9,8 @@ namespace Titon\Console;
 
 interface InputDefinition {
 
+    public function getAlias(): string;
+
     public function getDescription(): string;
 
     public function getName(): string;
diff --git a/tests/Titon/Console/CommandTest.hh b/tests/Titon/Console/CommandTest.hh
index 0b8ed29..17d5a22 100644
--- a/tests/Titon/Console/CommandTest.hh
+++ b/tests/Titon/Console/CommandTest.hh
@@ -3,19 +3,20 @@
 namespace Titon\Console;
 
 use Titon\Test\TestCase;
+use Titon\Test\Stub\Console\CommandStub;
 use Titon\Console\InputDefinition\Flag;
 use Titon\Console\InputDefinition\Option;
 use Titon\Console\InputDefinition\Argument;
 
 class CommandTest extends TestCase {
 
-    public function testAddArguments() {
+    public function testAddArguments(): void {
         $args = new Input([
             '-v'
         ]);
         $args->addFlag(new Flag('help', 'Show this help screen'));
 
-        $command = new TestCommand();
+        $command = new CommandStub();
         $command->setInput($args);
         $command->configure();
         $command->registerInput();
@@ -25,15 +26,4 @@ class CommandTest extends TestCase {
         $this->assertEquals(2, count($args->getFlags()));
         $this->assertEquals(1, $args->getFlag('v')->getValue());
     }
-}
-
-class TestCommand extends \Titon\Console\Command\AbstractCommand {
-
-    public function configure() {
-        $this->addFlag((new Flag('verbose', 'Set command verbosity'))->alias('v'));
-    }
-
-    public function run() {
-
-    }
 }
\ No newline at end of file
diff --git a/tests/Titon/Console/ParserTest.hh b/tests/Titon/Console/ParserTest.hh
index 6c041a9..6c9e1a4 100644
--- a/tests/Titon/Console/ParserTest.hh
+++ b/tests/Titon/Console/ParserTest.hh
@@ -2,132 +2,152 @@
 
 namespace Titon\Console;
 
+use Titon\Test\Stub\Console\CommandStub;
+use Titon\Test\Stub\Console\EmptyCommandStub;
 use Titon\Test\TestCase;
 use Titon\Console\InputDefinition\Flag;
 use Titon\Console\InputDefinition\Option;
 use Titon\Console\InputDefinition\Argument;
 
+/**
+ * @property \Titon\Console\Input $input
+ */
 class ArgumentParserTest extends TestCase {
 
-    public function testParseFlags() {
+    public function setUp() {
+        $this->input = new Input();
+        $this->input->addCommand(new EmptyCommandStub());
+    }
+
+    public function testParseFlags(): void {
         /*
          * Check basic flag
          */
-        $args = new Input([
+        $this->input->setInput([
+            'command',
             '--foo',
         ]);
-        $args->addFlag((new Flag('foo'))->alias('f'));
-        $args->parse();
+        $this->input->addFlag((new Flag('foo'))->alias('f'));
+        $this->input->parse();
 
-        $this->assertEquals(1, $args->getFlag('foo')->getValue());
-        $this->assertEquals(1, $args->getFlag('f')->getValue());
+        $this->assertEquals(1, $this->input->getFlag('foo')->getValue());
+        $this->assertEquals(1, $this->input->getFlag('f')->getValue());
 
-        $args = new Input([
+        $this->input->setInput([
+            'command',
             '-f',
         ]);
-        $args->addFlag((new Flag('foo'))->alias('f'));
-        $args->parse();
+        $this->input->addFlag((new Flag('foo'))->alias('f'));
+        $this->input->parse();
 
-        $this->assertEquals(1, $args->getFlag('foo')->getValue());
-        $this->assertEquals(1, $args->getFlag('f')->getValue());
+        $this->assertEquals(1, $this->input->getFlag('foo')->getValue());
+        $this->assertEquals(1, $this->input->getFlag('f')->getValue());
 
         /*
          * Check stacked, but different, flags
          */
-        $args = new Input([
+        $this->input->setInput([
+            'command',
             '-fb',
         ]);
-        $args->addFlag((new Flag('foo'))->alias('f'));
-        $args->addFlag((new Flag('bar'))->alias('b'));
-        $args->parse();
+        $this->input->addFlag((new Flag('foo'))->alias('f'));
+        $this->input->addFlag((new Flag('bar'))->alias('b'));
+        $this->input->parse();
 
-        $this->assertEquals(1, $args->getFlag('foo')->getValue());
-        $this->assertEquals(1, $args->getFlag('bar')->getValue());
+        $this->assertEquals(1, $this->input->getFlag('foo')->getValue());
+        $this->assertEquals(1, $this->input->getFlag('bar')->getValue());
 
         /*
          * Check stacked flag
          */
-        $args = new Input([
+        $this->input->SetInput([
+            'command',
             '-vvv',
         ]);
-        $args->addFlag((new Flag('v'))->setStackable(true));
-        $args->parse();
+        $this->input->addFlag((new Flag('v'))->setStackable(true));
+        $this->input->parse();
 
-        $this->assertEquals(3, $args->getFlag('v')->getValue());
+        $this->assertEquals(3, $this->input->getFlag('v')->getValue());
     }
 
-    public function testParseOptions() {
-        $args = new Input([
+    public function testParseOptions(): void {
+        $this->input->setInput([
+            'command',
             '--name',
             'Alex Phillips',
         ]);
-        $args->addOption((new Option('name'))->alias('n'));
-        $args->addArgument(new Argument('bar', 'Bar!'));
-        $args->parse();
+        $this->input->addOption((new Option('name'))->alias('n'));
+        $this->input->addArgument(new Argument('bar', 'Bar!'));
+        $this->input->parse();
 
-        $this->assertEquals('Alex Phillips', $args->getOption('name')->getValue());
-        $this->assertEquals('Alex Phillips', $args->getOption('n')->getValue());
+        $this->assertEquals('Alex Phillips', $this->input->getOption('name')->getValue());
+        $this->assertEquals('Alex Phillips', $this->input->getOption('n')->getValue());
 
-        $args = new Input([
+        $this->input->setInput([
             '--name',
             'Alex Phillips',
+            'command',
         ]);
-        $args->addOption((new Option('name'))->alias('n'));
-        $args->addArgument(new Argument('bar', 'Bar!'));
-        $args->parse();
+        $this->input->addOption((new Option('name'))->alias('n'));
+        $this->input->addArgument(new Argument('bar', 'Bar!'));
+        $this->input->parse();
 
-        $this->assertEquals('Alex Phillips', $args->getOption('name')->getValue());
-        $this->assertEquals('Alex Phillips', $args->getOption('n')->getValue());
+        $this->assertEquals('Alex Phillips', $this->input->getOption('name')->getValue());
+        $this->assertEquals('Alex Phillips', $this->input->getOption('n')->getValue());
 
-        $args = new Input([
+        $this->input->setInput([
+            'command',
             '-n',
             'Alex Phillips',
         ]);
-        $args->addOption((new Option('name'))->alias('n'));
-        $args->addArgument(new Argument('bar', 'Bar!'));
-        $args->parse();
+        $this->input->addOption((new Option('name'))->alias('n'));
+        $this->input->addArgument(new Argument('bar', 'Bar!'));
+        $this->input->parse();
 
-        $this->assertEquals('Alex Phillips', $args->getOption('name')->getValue());
-        $this->assertEquals('Alex Phillips', $args->getOption('n')->getValue());
+        $this->assertEquals('Alex Phillips', $this->input->getOption('name')->getValue());
+        $this->assertEquals('Alex Phillips', $this->input->getOption('n')->getValue());
 
-        $args = new Input([
+        $this->input->setInput([
+            'command',
             '--name="Alex Phillips"',
         ]);
-        $args->addOption((new Option('name'))->alias('n'));
-        $args->addArgument(new Argument('bar', 'Bar!'));
-        $args->parse();
+        $this->input->addOption((new Option('name'))->alias('n'));
+        $this->input->addArgument(new Argument('bar', 'Bar!'));
+        $this->input->parse();
 
-        $this->assertEquals('Alex Phillips', $args->getOption('name')->getValue());
-        $this->assertEquals('Alex Phillips', $args->getOption('n')->getValue());
+        $this->assertEquals('Alex Phillips', $this->input->getOption('name')->getValue());
+        $this->assertEquals('Alex Phillips', $this->input->getOption('n')->getValue());
     }
 
-    public function testParseArguments() {
-        $args = new Input([
+    public function testParseArguments(): void {
+        $this->input->setInput([
+            'command',
             'Alex Phillips',
         ]);
-        $args->addArgument(new Argument('name'));
-        $args->parse();
+        $this->input->addArgument(new Argument('name'));
+        $this->input->parse();
 
-        $this->assertEquals('Alex Phillips', $args->getArgument('name')->getValue());
+        $this->assertEquals('Alex Phillips', $this->input->getArgument('name')->getValue());
     }
 
-    public function testMixedArguments() {
-        $args = new Input([
+    public function testMixedArguments(): void {
+        $this->input->setInput([
+            'command',
             'Alex Phillips',
             '-fb',
             '--baz="woot"',
         ]);
-        $args->addFlag((new Flag('bar'))->alias('b'));
-        $args->addOption(new Option('baz'));
-        $args->addFlag((new Flag('foo'))->alias('f'));
-        $args->addArgument(new Argument('name'));
-        $args->parse();
-
-        $this->assertEquals('Alex Phillips', $args->getArgument('name')->getValue());
-        $this->assertEquals(1, $args->getFlag('foo')->getValue());
-        $this->assertEquals(1, $args->getFlag('f')->getValue());
-        $this->assertEquals(1, $args->getFlag('bar')->getValue());
-        $this->assertEquals(1, $args->getFlag('b')->getValue());
-        $this->assertEquals('woot', $args->getOption('baz')->getValue());
+        $this->input->addFlag((new Flag('bar'))->alias('b'));
+        $this->input->addOption(new Option('baz'));
+        $this->input->addFlag((new Flag('foo'))->alias('f'));
+        $this->input->addArgument(new Argument('name'));
+        $this->input->parse();
+
+        $this->assertEquals('Alex Phillips', $this->input->getArgument('name')->getValue());
+        $this->assertEquals(1, $this->input->getFlag('foo')->getValue());
+        $this->assertEquals(1, $this->input->getFlag('f')->getValue());
+        $this->assertEquals(1, $this->input->getFlag('bar')->getValue());
+        $this->assertEquals(1, $this->input->getFlag('b')->getValue());
+        $this->assertEquals('woot', $this->input->getOption('baz')->getValue());
     }
 }
\ No newline at end of file
diff --git a/tests/Titon/Test/Stub/Console/CommandStub.hh b/tests/Titon/Test/Stub/Console/CommandStub.hh
new file mode 100644
index 0000000..484434e
--- /dev/null
+++ b/tests/Titon/Test/Stub/Console/CommandStub.hh
@@ -0,0 +1,17 @@
+<?hh // strict
+
+namespace Titon\Test\Stub\Console;
+
+use Titon\Console\Command\AbstractCommand;
+use Titon\Console\InputDefinition\Flag;
+
+class CommandStub extends AbstractCommand {
+
+    public function configure() {
+        $this->addFlag((new Flag('verbose', 'Set command verbosity'))->alias('v'));
+    }
+
+    public function run() {
+
+    }
+}
\ No newline at end of file

From dbbaee604b1f682d1b11060eae6c179a45b2120a Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Fri, 27 Feb 2015 19:26:11 -0500
Subject: [PATCH 15/92] initial commit

---
 .../Titon/Test/Stub/Console/EmptyCommandStub.hh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 tests/Titon/Test/Stub/Console/EmptyCommandStub.hh

diff --git a/tests/Titon/Test/Stub/Console/EmptyCommandStub.hh b/tests/Titon/Test/Stub/Console/EmptyCommandStub.hh
new file mode 100644
index 0000000..2297ad1
--- /dev/null
+++ b/tests/Titon/Test/Stub/Console/EmptyCommandStub.hh
@@ -0,0 +1,17 @@
+<?hh // strict
+
+namespace Titon\Test\Stub\Console;
+
+use Titon\Console\Command\AbstractCommand;
+use Titon\Console\InputDefinition\Flag;
+
+class EmptyCommandStub extends AbstractCommand {
+
+    public function configure() {
+        $this->setName('command');
+    }
+
+    public function run() {
+
+    }
+}
\ No newline at end of file

From bade068eea1bb0d32780d9a41dff35ca31562f15 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Sat, 28 Feb 2015 12:50:44 -0500
Subject: [PATCH 16/92] added support for rendering tree structures

---
 src/Titon/Console/Tree.hh           | 17 ++++++++++++++
 src/Titon/Console/Tree/AsciiTree.hh | 35 +++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 src/Titon/Console/Tree.hh
 create mode 100644 src/Titon/Console/Tree/AsciiTree.hh

diff --git a/src/Titon/Console/Tree.hh b/src/Titon/Console/Tree.hh
new file mode 100644
index 0000000..08533e4
--- /dev/null
+++ b/src/Titon/Console/Tree.hh
@@ -0,0 +1,17 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+interface Tree {
+
+    protected function build(?array<string> $tree = null, string $prefix = ''): string;
+
+    public function getData(): array<string>;
+
+    public function render(): string;
+
+    public function setData(): this;
+}
\ No newline at end of file
diff --git a/src/Titon/Console/Tree/AsciiTree.hh b/src/Titon/Console/Tree/AsciiTree.hh
new file mode 100644
index 0000000..eb9ad8b
--- /dev/null
+++ b/src/Titon/Console/Tree/AsciiTree.hh
@@ -0,0 +1,35 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\Tree;
+
+class AsciiTree extends AbstractTree {
+
+    protected function build(?array<string> $tree = null, string $prefix = ''): string {
+        if (is_null($tree)) {
+            $tree = $this->data;
+        }
+
+        $retval = [];
+
+        $keys = array_keys($tree);
+        $branch = array_values($tree);
+        for ($i = 0, $count = count($branch); $i < $count; ++$i) {
+            if (is_array($branch[$i])) {
+                $retval[] = $prefix . '+-' . $keys[$i];
+            } else {
+                $retval[] = $prefix . '+-' . $branch[$i];
+            }
+
+            if (is_array($branch[$i])) {
+                $retval[] = $this->build($branch[$i], $prefix . ($i == $count - 1 ? '  ' : '| '));
+            }
+        }
+
+        return implode("\n", $retval);
+    }
+}
\ No newline at end of file

From 6166fdb64378fd1aedf2f1d4d496f542d9d26092 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Sat, 28 Feb 2015 12:50:53 -0500
Subject: [PATCH 17/92] initial commit

---
 src/Titon/Console/Tree/AbstractTree.hh | 31 ++++++++++++++++++++++++
 src/Titon/Console/Tree/MarkdownTree.hh | 33 ++++++++++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 src/Titon/Console/Tree/AbstractTree.hh
 create mode 100644 src/Titon/Console/Tree/MarkdownTree.hh

diff --git a/src/Titon/Console/Tree/AbstractTree.hh b/src/Titon/Console/Tree/AbstractTree.hh
new file mode 100644
index 0000000..f614235
--- /dev/null
+++ b/src/Titon/Console/Tree/AbstractTree.hh
@@ -0,0 +1,31 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\Tree;
+
+class AbstractTree {
+
+    protected array<string> $data = [];
+
+    public function __construct(array<string> $data = []) {
+        $this->data = $data;
+    }
+
+    public function getData(): array<string> {
+        return $this->data;
+    }
+
+    public function render(): string {
+        return $this->build($this->data, '');
+    }
+
+    public function setData(array<string> $data): this {
+        $this->data = $data;
+
+        return $this;
+    }
+}
\ No newline at end of file
diff --git a/src/Titon/Console/Tree/MarkdownTree.hh b/src/Titon/Console/Tree/MarkdownTree.hh
new file mode 100644
index 0000000..103bcab
--- /dev/null
+++ b/src/Titon/Console/Tree/MarkdownTree.hh
@@ -0,0 +1,33 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\Tree;
+
+class MarkdownTree extends AbstractTree {
+
+    protected function build(?array<string> $tree = null, string $prefix = ''): string {
+        if (is_null($tree)) {
+            $tree = $this->data;
+        }
+
+        $retval = [];
+
+        foreach ($tree as $label => $branch) {
+            if (is_string($branch)) {
+                $label = $branch;
+            }
+
+            $retval[] = "$prefix- $label";
+
+            if (is_array($branch)) {
+                $retval[] = $this->build($branch, "$prefix  ");
+            }
+        }
+
+        return implode("\n", $retval);
+    }
+}
\ No newline at end of file

From 5b3f66f7fb5ef36a52ee105a316fb0dee9387854 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Sat, 28 Feb 2015 12:52:06 -0500
Subject: [PATCH 18/92] fixed type check errors

---
 src/Titon/Console/InputDefinition.hh   | 4 ++++
 src/Titon/Console/Tree/AbstractTree.hh | 2 +-
 src/Titon/Console/Tree/MarkdownTree.hh | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Titon/Console/InputDefinition.hh b/src/Titon/Console/InputDefinition.hh
index ae77136..830a741 100644
--- a/src/Titon/Console/InputDefinition.hh
+++ b/src/Titon/Console/InputDefinition.hh
@@ -13,6 +13,10 @@ interface InputDefinition {
 
     public function getDescription(): string;
 
+    public function getFormattedName(string $name): string;
+
+    public function getMode(): int;
+
     public function getName(): string;
 
     public function getValue(): mixed;
diff --git a/src/Titon/Console/Tree/AbstractTree.hh b/src/Titon/Console/Tree/AbstractTree.hh
index f614235..3da972e 100644
--- a/src/Titon/Console/Tree/AbstractTree.hh
+++ b/src/Titon/Console/Tree/AbstractTree.hh
@@ -20,7 +20,7 @@ class AbstractTree {
     }
 
     public function render(): string {
-        return $this->build($this->data, '');
+        return $this->build($this->data);
     }
 
     public function setData(array<string> $data): this {
diff --git a/src/Titon/Console/Tree/MarkdownTree.hh b/src/Titon/Console/Tree/MarkdownTree.hh
index 103bcab..9038c57 100644
--- a/src/Titon/Console/Tree/MarkdownTree.hh
+++ b/src/Titon/Console/Tree/MarkdownTree.hh
@@ -9,7 +9,7 @@ namespace Titon\Console\Tree;
 
 class MarkdownTree extends AbstractTree {
 
-    protected function build(?array<string> $tree = null, string $prefix = ''): string {
+    protected function build(array<string> $tree, string $prefix = ''): string {
         if (is_null($tree)) {
             $tree = $this->data;
         }

From 47934a27234b6aba7764e613e68faf1b37d22a37 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Sun, 1 Mar 2015 09:32:49 -0500
Subject: [PATCH 19/92] user now just calls 'render' on a  tree to output it,
 the render will handle the call to the now protected method 'build' as
 necessary

---
 src/Titon/Console/Tree.hh              | 6 +++---
 src/Titon/Console/Tree/AbstractTree.hh | 6 +++++-
 src/Titon/Console/Tree/AsciiTree.hh    | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Titon/Console/Tree.hh b/src/Titon/Console/Tree.hh
index 08533e4..d786b7f 100644
--- a/src/Titon/Console/Tree.hh
+++ b/src/Titon/Console/Tree.hh
@@ -5,13 +5,13 @@
  * @link        http://titon.io
  */
 
-interface Tree {
+namespace Titon\Console;
 
-    protected function build(?array<string> $tree = null, string $prefix = ''): string;
+interface Tree {
 
     public function getData(): array<string>;
 
     public function render(): string;
 
-    public function setData(): this;
+    public function setData(array<string> $data): this;
 }
\ No newline at end of file
diff --git a/src/Titon/Console/Tree/AbstractTree.hh b/src/Titon/Console/Tree/AbstractTree.hh
index 3da972e..cbe66bd 100644
--- a/src/Titon/Console/Tree/AbstractTree.hh
+++ b/src/Titon/Console/Tree/AbstractTree.hh
@@ -7,7 +7,9 @@
 
 namespace Titon\Console\Tree;
 
-class AbstractTree {
+use Titon\Console\Tree;
+
+abstract class AbstractTree implements Tree {
 
     protected array<string> $data = [];
 
@@ -15,6 +17,8 @@ class AbstractTree {
         $this->data = $data;
     }
 
+    abstract protected function build(array<string> $tree, string $prefix = ''): string;
+
     public function getData(): array<string> {
         return $this->data;
     }
diff --git a/src/Titon/Console/Tree/AsciiTree.hh b/src/Titon/Console/Tree/AsciiTree.hh
index eb9ad8b..60ac40c 100644
--- a/src/Titon/Console/Tree/AsciiTree.hh
+++ b/src/Titon/Console/Tree/AsciiTree.hh
@@ -9,7 +9,7 @@ namespace Titon\Console\Tree;
 
 class AsciiTree extends AbstractTree {
 
-    protected function build(?array<string> $tree = null, string $prefix = ''): string {
+    protected function build(array<string> $tree, string $prefix = ''): string {
         if (is_null($tree)) {
             $tree = $this->data;
         }

From 49ee2773f5b27a6a828da7e1dbea7d84f337933d Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Sun, 1 Mar 2015 09:38:28 -0500
Subject: [PATCH 20/92] added support for outputingg ASCII and tab-delimited
 tables

---
 src/Titon/Console/Table.hh                   | 17 ++++
 src/Titon/Console/Table/AbstractTable.hh     | 74 ++++++++++++++++
 src/Titon/Console/Table/AsciiTable.hh        | 91 ++++++++++++++++++++
 src/Titon/Console/Table/TabDelimitedTable.hh | 22 +++++
 4 files changed, 204 insertions(+)
 create mode 100644 src/Titon/Console/Table.hh
 create mode 100644 src/Titon/Console/Table/AbstractTable.hh
 create mode 100644 src/Titon/Console/Table/AsciiTable.hh
 create mode 100644 src/Titon/Console/Table/TabDelimitedTable.hh

diff --git a/src/Titon/Console/Table.hh b/src/Titon/Console/Table.hh
new file mode 100644
index 0000000..74e617c
--- /dev/null
+++ b/src/Titon/Console/Table.hh
@@ -0,0 +1,17 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console;
+
+interface Table {
+
+    public function addRow(Vector<string> $row): this;
+
+    public function render(): string;
+
+    public function setRows(Vector<Vector<string>> $rows): this;
+}
\ No newline at end of file
diff --git a/src/Titon/Console/Table/AbstractTable.hh b/src/Titon/Console/Table/AbstractTable.hh
new file mode 100644
index 0000000..2c1187d
--- /dev/null
+++ b/src/Titon/Console/Table/AbstractTable.hh
@@ -0,0 +1,74 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\Table;
+
+use Titon\Console\Table;
+
+abstract class AbstractTable implements Table {
+
+    protected Vector<int> $columnWidths = Vector {};
+
+    protected Vector<string> $headers = Vector {};
+
+    protected Vector<Vector<string>> $rows = Vector {};
+
+    public function addRow(Vector<string> $row): this {
+        $this->setColumnWidths($row);
+        $this->rows[] = $row;
+
+        return $this;
+    }
+
+    public function setColumnWidths(Vector<string> $row): void {
+        foreach ($row as $index => $value) {
+            $width = strlen($value);
+            if (is_null($currentWidth = $this->columnWidths->get($index)) || $width > $currentWidth) {
+                if ($this->columnWidths->count() === $index) {
+                    $this->columnWidths[] = $width;
+                } else {
+                    $this->columnWidths[$index] = $width;
+                }
+            }
+        }
+    }
+
+    public function setData(Vector<Map<string, string>> $data): this {
+        $rows = Vector {};
+        $headers = Vector {};
+        foreach ($data as $row) {
+            foreach ($row as $column => $value) {
+                if ($headers->linearSearch($column) < 0) {
+                    $headers[] = $column;
+                }
+            }
+
+            $rows[] = $row->values();
+        }
+
+        $this->setRows($rows);
+        $this->setHeaders($headers);
+
+        return $this;
+    }
+
+    public function setHeaders(Vector<string> $headers): this {
+        $this->setColumnWidths($headers);
+        $this->headers = $headers;
+
+        return $this;
+    }
+
+    public function setRows(Vector<Vector<string>> $rows): this {
+        $this->rows->clear();
+        foreach ($rows as $row) {
+            $this->addRow($row);
+        }
+
+        return $this;
+    }
+}
\ No newline at end of file
diff --git a/src/Titon/Console/Table/AsciiTable.hh b/src/Titon/Console/Table/AsciiTable.hh
new file mode 100644
index 0000000..cf825be
--- /dev/null
+++ b/src/Titon/Console/Table/AsciiTable.hh
@@ -0,0 +1,91 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\Table;
+
+class AsciiTable extends AbstractTable {
+
+    protected Map<string, string> $characters = array(
+        'corner'      => '+',
+        'line'        => '-',
+        'header_line' => '=',
+        'border'      => '|',
+        'padding'     => ' ',
+    );
+
+    protected ?int $rowWidth;
+
+    protected function pad(string $value, string $pad = ''): string {
+        return "$pad$value$pad";
+    }
+
+    protected function buildBorder(bool $header = false): string {
+        if ($header) {
+            return str_repeat($this->characters['header_line'], $this->getRowWidth());
+        }
+
+        return str_repeat($this->characters['line'], $this->getRowWidth());
+    }
+
+    protected function buildCell(string $value, int $key): string {
+        return $this->pad(str_pad($value, $this->columnWidths->get($key)), $this->characters['padding']);
+    }
+
+    protected function buildHeader(): string {
+        $retval = Vector {};
+
+        if (!$this->headers->isEmpty()) {
+            $headers = [];
+            foreach ($this->headers as $index => $column) {
+                $headers[] = $this->characters['padding'] . str_pad($column, $this->columnWidths->get($index)) . $this->characters['padding'];
+            }
+            $headers = implode($this->characters['border'], $headers);
+            if ($headers) {
+                $headers = $this->pad($headers, $this->characters['border']);
+                $border = $this->buildBorder(true);
+                $retval[] = $border;
+                $retval[] = $headers;
+                $retval[] = $border;
+            }
+        } else {
+            $retval[] = $this->buildBorder();
+        }
+
+        return implode("\n", $retval);
+    }
+
+    protected function buildRow(Vector<string> $data): string {
+            $row = [];
+            foreach ($data as $index => $value) {
+                $row[] = $this->buildCell($value, $index);
+            }
+            $row = $this->pad(implode($this->characters['border'], $row), $this->characters['border']);
+
+            return $row;
+    }
+
+    protected function getRowWidth(): int {
+        if (is_null($this->rowWidth)) {
+            $this->rowWidth = strlen($this->buildRow($this->rows->get(0)));
+        }
+
+        return $this->rowWidth;
+    }
+
+    public function render(): string {
+        $retval = Vector {};
+
+        $retval[] = $this->buildHeader();
+
+        foreach ($this->rows as $row) {
+            $retval[] = $this->buildRow($row);
+            $retval[] = $this->buildBorder();
+        }
+
+        return implode("\n", $retval);
+    }
+}
\ No newline at end of file
diff --git a/src/Titon/Console/Table/TabDelimitedTable.hh b/src/Titon/Console/Table/TabDelimitedTable.hh
new file mode 100644
index 0000000..9c46642
--- /dev/null
+++ b/src/Titon/Console/Table/TabDelimitedTable.hh
@@ -0,0 +1,22 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\Table;
+
+class TabDelimitedTable extends AbstractTable {
+
+    public function render(): string {
+        $retval = Vector {};
+
+        $retval[] = implode("\t", $this->headers);
+        foreach ($this->rows as $row) {
+            $retval[] = implode("\t", $row);
+        }
+
+        return trim(implode("\n", $retval));
+    }
+}
\ No newline at end of file

From 229b5f49ebe02cfc7cba8501f1befb11f2a5da6b Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Mon, 2 Mar 2015 17:31:19 -0500
Subject: [PATCH 21/92] added negative aliases to flags (i.e., --foo /
 --no-foo)

---
 src/Titon/Console/Command/AbstractCommand.hh  |  2 +-
 src/Titon/Console/Input.hh                    | 26 +++++++++++++------
 .../AbstractInputDefinition.hh                |  8 ++++--
 src/Titon/Console/InputDefinition/Argument.hh |  1 +
 src/Titon/Console/InputDefinition/Flag.hh     | 24 ++++++++++++-----
 src/Titon/Console/InputDefinition/Option.hh   |  8 ------
 tests/Titon/Console/ParserTest.hh             | 12 +++++++++
 7 files changed, 56 insertions(+), 25 deletions(-)

diff --git a/src/Titon/Console/Command/AbstractCommand.hh b/src/Titon/Console/Command/AbstractCommand.hh
index 1b3e79f..b3aefc9 100644
--- a/src/Titon/Console/Command/AbstractCommand.hh
+++ b/src/Titon/Console/Command/AbstractCommand.hh
@@ -69,7 +69,7 @@ abstract class AbstractCommand implements Command {
         return $this->description;
     }
 
-    protected function getFlag(string $key): ?int {
+    protected function getFlag(string $key): mixed {
         if ($flag = $this->input->getFlag($key)) {
             return $flag->getValue();
         }
diff --git a/src/Titon/Console/Input.hh b/src/Titon/Console/Input.hh
index 81478df..9edae5a 100644
--- a/src/Titon/Console/Input.hh
+++ b/src/Titon/Console/Input.hh
@@ -230,19 +230,29 @@ class Input {
      */
     protected function parseFlag(RawInput $input): bool {
         $key = $input['value'];
-        if (is_null($flag = $this->flags->get($key))) {
-            return false;
+        if (!is_null($flag = $this->flags->get($key))) {
+            invariant($flag instanceof Flag, "Must be a Flag.");
+
+            if ($flag->isStackable()) {
+                $flag->increaseValue();
+            } else {
+                $flag->setValue(1);
+            }
+
+            return true;
         }
 
-        invariant($flag instanceof Flag, "Must be a Flag.");
+        foreach ($this->flags as $name => $flag) {
+            if ($key === $flag->getNegativeAlias()) {
+                invariant($flag instanceof Flag, "Must be a Flag.");
 
-        if ($flag->isStackable()) {
-            $flag->increaseValue();
-        } else {
-            $flag->setValue(1);
+                $flag->setValue(0);
+
+                return true;
+            }
         }
 
-        return true;
+        return false;
     }
 
     /**
diff --git a/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh b/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
index a488695..1ab5f35 100644
--- a/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
+++ b/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
@@ -14,7 +14,7 @@ abstract class AbstractInputDefinition implements InputDefinition {
     const VALUE_OPTIONAL = 0;
     const VALUE_REQUIRED = 1;
 
-    protected ?string $alias;
+    protected string $alias = '';
 
     protected mixed $default;
 
@@ -44,7 +44,7 @@ abstract class AbstractInputDefinition implements InputDefinition {
         return true;
     }
 
-    public function getAlias(): ?string {
+    public function getAlias(): string {
         return $this->alias;
     }
 
@@ -64,6 +64,10 @@ abstract class AbstractInputDefinition implements InputDefinition {
         return "--$name";
     }
 
+    public function getMode(): int {
+        return $this->mode;
+    }
+
     public function getName(): string {
         return $this->name;
     }
diff --git a/src/Titon/Console/InputDefinition/Argument.hh b/src/Titon/Console/InputDefinition/Argument.hh
index bba1314..b375e7f 100644
--- a/src/Titon/Console/InputDefinition/Argument.hh
+++ b/src/Titon/Console/InputDefinition/Argument.hh
@@ -9,6 +9,7 @@ namespace Titon\Console\InputDefinition;
 
 class Argument extends AbstractInputDefinition {
 
+    <<Override>>
     public function getFormattedName(string $name): string {
         return $name;
     }
diff --git a/src/Titon/Console/InputDefinition/Flag.hh b/src/Titon/Console/InputDefinition/Flag.hh
index fbe5512..8deb11f 100644
--- a/src/Titon/Console/InputDefinition/Flag.hh
+++ b/src/Titon/Console/InputDefinition/Flag.hh
@@ -9,21 +9,23 @@ namespace Titon\Console\InputDefinition;
 
 class Flag extends AbstractInputDefinition {
 
+    protected ?string $negativeAlias;
+
     protected bool $stackable = false;
 
     public function __construct(string $name, string $description = '', int $mode = self::VALUE_OPTIONAL, bool $stackable = false) {
         parent::__construct($name, $description, $mode);
 
+        if (strlen($name) > 1) {
+            $this->negativeAlias = "no-$name";
+        }
+
         $this->default = 0;
         $this->stackable = $stackable;
     }
 
-    public function getValue(): int {
-        if (!is_null($this->value)) {
-            return (int)$this->value;
-        }
-
-        return (int)$this->default;
+    public function getNegativeAlias(): ?string {
+        return $this->negativeAlias;
     }
 
     public function increaseValue(): this {
@@ -44,6 +46,16 @@ class Flag extends AbstractInputDefinition {
         return $this->stackable;
     }
 
+    public function setAlias(string $alias): this {
+        parent::setAlias($alias);
+
+        if (strlen($this->getName()) > 1) {
+            $this->negativeAlias = "no-{$this->getName()}";
+        }
+
+        return $this;
+    }
+
     public function setStackable(bool $stackable): this {
         $this->stackable = $stackable;
 
diff --git a/src/Titon/Console/InputDefinition/Option.hh b/src/Titon/Console/InputDefinition/Option.hh
index 4cae742..bf71613 100644
--- a/src/Titon/Console/InputDefinition/Option.hh
+++ b/src/Titon/Console/InputDefinition/Option.hh
@@ -9,14 +9,6 @@ namespace Titon\Console\InputDefinition;
 
 class Option extends AbstractInputDefinition {
 
-    public function getValue(mixed $default = null): mixed {
-        if (!is_null($this->value)) {
-            return $this->value;
-        }
-
-        return $default;
-    }
-
     public function setDefault(string $default): this {
         $this->default = $default;
 
diff --git a/tests/Titon/Console/ParserTest.hh b/tests/Titon/Console/ParserTest.hh
index 6c9e1a4..0255137 100644
--- a/tests/Titon/Console/ParserTest.hh
+++ b/tests/Titon/Console/ParserTest.hh
@@ -68,6 +68,18 @@ class ArgumentParserTest extends TestCase {
         $this->input->parse();
 
         $this->assertEquals(3, $this->input->getFlag('v')->getValue());
+
+        /*
+         * Check inverse flags
+         */
+        $this->input->setInput([
+            '--no-foo',
+        ]);
+
+        $this->input->addFlag(new Flag('foo'));
+        $this->input->parse();
+
+        $this->assertEquals(0, $this->input->getFlag('foo')->getValue());
     }
 
     public function testParseOptions(): void {

From 15653b1a47719c53f00504417076ce5f7ae51873 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Mon, 2 Mar 2015 17:43:36 -0500
Subject: [PATCH 22/92] adjusted styling of table output

---
 src/Titon/Console/Table/AsciiTable.hh | 75 ++++++++++++---------------
 1 file changed, 34 insertions(+), 41 deletions(-)

diff --git a/src/Titon/Console/Table/AsciiTable.hh b/src/Titon/Console/Table/AsciiTable.hh
index cf825be..ae17936 100644
--- a/src/Titon/Console/Table/AsciiTable.hh
+++ b/src/Titon/Console/Table/AsciiTable.hh
@@ -9,13 +9,15 @@ namespace Titon\Console\Table;
 
 class AsciiTable extends AbstractTable {
 
-    protected Map<string, string> $characters = array(
-        'corner'      => '+',
-        'line'        => '-',
+    protected ?string $border;
+
+    protected Map<string, string> $characters = Map {
+        'corner' => '+',
+        'line' => '-',
         'header_line' => '=',
-        'border'      => '|',
-        'padding'     => ' ',
-    );
+        'border' => '|',
+        'padding' => ' ',
+    };
 
     protected ?int $rowWidth;
 
@@ -24,53 +26,38 @@ class AsciiTable extends AbstractTable {
     }
 
     protected function buildBorder(bool $header = false): string {
-        if ($header) {
-            return str_repeat($this->characters['header_line'], $this->getRowWidth());
+        if (is_null($this->border)) {
+            $this->border = '+';
+            foreach ($this->columnWidths as $width) {
+                $this->border .= $this->characters['padding'];
+                $this->border .= str_repeat('-', $width);
+                $this->border .= $this->characters['padding'];
+                $this->border .= '+';
+            }
         }
 
-        return str_repeat($this->characters['line'], $this->getRowWidth());
+        return $this->border;
     }
 
     protected function buildCell(string $value, int $key): string {
         return $this->pad(str_pad($value, $this->columnWidths->get($key)), $this->characters['padding']);
     }
 
-    protected function buildHeader(): string {
-        $retval = Vector {};
-
-        if (!$this->headers->isEmpty()) {
-            $headers = [];
-            foreach ($this->headers as $index => $column) {
-                $headers[] = $this->characters['padding'] . str_pad($column, $this->columnWidths->get($index)) . $this->characters['padding'];
-            }
-            $headers = implode($this->characters['border'], $headers);
-            if ($headers) {
-                $headers = $this->pad($headers, $this->characters['border']);
-                $border = $this->buildBorder(true);
-                $retval[] = $border;
-                $retval[] = $headers;
-                $retval[] = $border;
-            }
-        } else {
-            $retval[] = $this->buildBorder();
-        }
-
-        return implode("\n", $retval);
-    }
-
     protected function buildRow(Vector<string> $data): string {
-            $row = [];
-            foreach ($data as $index => $value) {
-                $row[] = $this->buildCell($value, $index);
-            }
-            $row = $this->pad(implode($this->characters['border'], $row), $this->characters['border']);
+        $row = [];
+        foreach ($data as $index => $value) {
+            $row[] = $this->buildCell($value, $index);
+        }
+        $row = $this->pad(implode($this->characters['border'], $row), $this->characters['border']);
 
-            return $row;
+        return $row;
     }
 
     protected function getRowWidth(): int {
         if (is_null($this->rowWidth)) {
-            $this->rowWidth = strlen($this->buildRow($this->rows->get(0)));
+            if (!is_null($this->rows[0])) {
+                $this->rowWidth = strlen($this->buildRow($row));
+            }
         }
 
         return $this->rowWidth;
@@ -79,13 +66,19 @@ class AsciiTable extends AbstractTable {
     public function render(): string {
         $retval = Vector {};
 
-        $retval[] = $this->buildHeader();
+        if ($header = $this->buildRow($this->headers)) {
+            $retval[] = $this->buildBorder();
+            $retval[] = $header;
+        }
+
+        $retval[] = $this->buildBorder();
 
         foreach ($this->rows as $row) {
             $retval[] = $this->buildRow($row);
-            $retval[] = $this->buildBorder();
         }
 
+        $retval[] = $this->buildBorder();
+
         return implode("\n", $retval);
     }
 }
\ No newline at end of file

From d367e6434faf0520bf1ea06103413346247c2a41 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 3 Mar 2015 20:08:29 -0500
Subject: [PATCH 23/92] added documentation

---
 .../AbstractInputDefinition.hh                | 116 ++++++++++++++++--
 1 file changed, 106 insertions(+), 10 deletions(-)

diff --git a/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh b/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
index 1ab5f35..8e8baf8 100644
--- a/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
+++ b/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
@@ -9,53 +9,126 @@ namespace Titon\Console\InputDefinition;
 
 use Titon\Console\InputDefinition;
 
+/**
+ * An InputDefinition is an object that designates the parameters accepted by
+ * the user when executing commands.
+ *
+ * @package Titon\Console\InputDefinition
+ */
 abstract class AbstractInputDefinition implements InputDefinition {
 
-    const VALUE_OPTIONAL = 0;
-    const VALUE_REQUIRED = 1;
+    const int MODE_OPTIONAL = 0;
+    const int MODE_REQUIRED = 1;
 
+    /**
+     * An alternate notation to specify the input as.
+     *
+     * @var string
+     */
     protected string $alias = '';
 
+    /**
+     * The default value given to the input if not specified by the user.
+     *
+     * @var mixed
+     */
     protected mixed $default;
 
+    /**
+     * The description of the input.
+     *
+     * @var string
+     */
     protected string $description;
 
-    protected int $mode = self::VALUE_OPTIONAL;
-
+    /**
+     * The mode of the input to determine if it should be required by the user.
+     *
+     * @var int
+     */
+    protected int $mode = self::MODE_OPTIONAL;
+
+    /**
+     * The name and primary method to specify the input.
+     *
+     * @var string
+     */
     protected string $name;
 
+    /**
+     * The value the user has given the input.
+     *
+     * @var mixed
+     */
     protected mixed $value;
 
-    public function __construct(string $name, string $description = '', int $mode = self::VALUE_OPTIONAL) {
+    /**
+     * Cosntruct a new instance of an `InputDefinition`.
+     *
+     * @param string $name
+     * @param string $description
+     * @param int    $mode
+     */
+    public function __construct(string $name, string $description = '', int $mode = self::MODE_OPTIONAL) {
         $this->name = $name;
         $this->description = $description;
         $this->mode = $mode;
     }
 
+    /**
+     * Alias method for setting the alias of the `InputDefinition`.
+     *
+     * @param string $alias The input's alias
+     *
+     * @return $this
+     */
     public function alias(string $alias): this {
         return $this->setAlias($alias);
     }
 
+    /**
+     * Method to return if the `InputDefinition` was specified by the user.
+     *
+     * @return bool
+     */
     public function exists(): bool {
-        if (is_null($this->value)) {
-            return false;
-        }
-
-        return true;
+        return !is_null($this->value);
     }
 
+    /**
+     * Retrieve the alias of the `InputDefinition`.
+     *
+     * @return string
+     */
     public function getAlias(): string {
         return $this->alias;
     }
 
+    /**
+     * Retrieve the default value of the `InputDefinition`.
+     *
+     * @return mixed
+     */
     public function getDefault(): mixed {
         return $this->default;
     }
 
+    /**
+     * Retrieve the description of the `InputDefinition`.
+     *
+     * @return string
+     */
     public function getDescription(): string {
         return $this->description;
     }
 
+    /**
+     * Retrieve the formatted name as it should be entered by the user.
+     *
+     * @param string $name The string name to format
+     *
+     * @return string
+     */
     public function getFormattedName(string $name): string {
         if (strlen($name) === 1) {
             return "-$name";
@@ -64,14 +137,30 @@ abstract class AbstractInputDefinition implements InputDefinition {
         return "--$name";
     }
 
+    /**
+     * Retrieve the mode of the `InputDefinition`.
+     *
+     * @return int
+     */
     public function getMode(): int {
         return $this->mode;
     }
 
+    /**
+     * Retrieve the name of the `InputDefinition`.
+     *
+     * @return string
+     */
     public function getName(): string {
         return $this->name;
     }
 
+    /**
+     * Retrieve the value as specified by the user for the `InputDefinition`. If
+     * the user has not specified the value, the default value is returned.
+     *
+     * @return mixed
+     */
     public function getValue(): mixed {
         if (!is_null($this->value)) {
             return $this->value;
@@ -80,6 +169,13 @@ abstract class AbstractInputDefinition implements InputDefinition {
         return $this->default;
     }
 
+    /**
+     * Set the alias of the `InputDefinition`.
+     *
+     * @param string $alias The alternate name to specify
+     *
+     * @return string
+     */
     public function setAlias(string $alias): this {
         if (strlen($alias) > strlen($this->name)) {
             $this->alias = $this->name;

From a324a34147d3c8dfa5f901dbebdaca655d3f69d4 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 3 Mar 2015 20:08:45 -0500
Subject: [PATCH 24/92] changed name of constants

---
 src/Titon/Console/HelpScreen.hh           | 6 +++---
 src/Titon/Console/InputDefinition/Flag.hh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Titon/Console/HelpScreen.hh b/src/Titon/Console/HelpScreen.hh
index 46a6b90..d80e3ec 100644
--- a/src/Titon/Console/HelpScreen.hh
+++ b/src/Titon/Console/HelpScreen.hh
@@ -184,7 +184,7 @@ class HelpScreen {
 
             foreach ($command->getArguments() as $argument) {
                 $arg = $argument->getName();
-                if ($argument->getMode() === AbstractInputDefinition::VALUE_OPTIONAL) {
+                if ($argument->getMode() === AbstractInputDefinition::MODE_OPTIONAL) {
                     $usage[] = "[$arg]";
                 }
             }
@@ -193,7 +193,7 @@ class HelpScreen {
                 if ($argument->getAlias()) {
                     $arg = "$arg|{$argument->getAlias()}";
                 }
-                if ($argument->getMode() === AbstractInputDefinition::VALUE_OPTIONAL) {
+                if ($argument->getMode() === AbstractInputDefinition::MODE_OPTIONAL) {
                     $usage[] = "[$arg]";
                 }
             }
@@ -204,7 +204,7 @@ class HelpScreen {
                 }
 
                 $arg = "$arg=\"...\"";
-                if ($argument->getMode() === AbstractInputDefinition::VALUE_OPTIONAL) {
+                if ($argument->getMode() === AbstractInputDefinition::MODE_OPTIONAL) {
                     $usage[] = "[$arg]";
                 }
             }
diff --git a/src/Titon/Console/InputDefinition/Flag.hh b/src/Titon/Console/InputDefinition/Flag.hh
index 8deb11f..153705e 100644
--- a/src/Titon/Console/InputDefinition/Flag.hh
+++ b/src/Titon/Console/InputDefinition/Flag.hh
@@ -13,7 +13,7 @@ class Flag extends AbstractInputDefinition {
 
     protected bool $stackable = false;
 
-    public function __construct(string $name, string $description = '', int $mode = self::VALUE_OPTIONAL, bool $stackable = false) {
+    public function __construct(string $name, string $description = '', int $mode = self::MODE_OPTIONAL, bool $stackable = false) {
         parent::__construct($name, $description, $mode);
 
         if (strlen($name) > 1) {

From 65e501ce87969feb56766c897259558c9a6adf65 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 3 Mar 2015 22:06:01 -0500
Subject: [PATCH 25/92] yay for documentation!

---
 src/Titon/Console/Command.hh                  |  43 ++++++
 src/Titon/Console/Command/AbstractCommand.hh  | 135 +++++++++++++++++
 src/Titon/Console/HelpScreen.hh               | 126 ++++++++++++++++
 src/Titon/Console/Input.hh                    | 142 +++++++++++++++---
 src/Titon/Console/InputBag.hh                 |  15 ++
 src/Titon/Console/InputDefinition.hh          |  37 +++++
 src/Titon/Console/InputDefinition/Argument.hh |  19 ++-
 src/Titon/Console/InputDefinition/Flag.hh     |  76 ++++++++++
 src/Titon/Console/InputDefinition/Option.hh   |  19 +++
 src/Titon/Console/InputLexer.hh               | 118 +++++++++++++++
 src/Titon/Console/Table.hh                    |  30 +++-
 src/Titon/Console/Table/AbstractTable.hh      |  67 ++++++++-
 src/Titon/Console/Table/AsciiTable.hh         |  66 +++++++-
 src/Titon/Console/Table/TabDelimitedTable.hh  |  11 ++
 src/Titon/Console/Tree.hh                     |  26 +++-
 src/Titon/Console/Tree/AbstractTree.hh        |  48 +++++-
 src/Titon/Console/Tree/AsciiTree.hh           |   8 +
 src/Titon/Console/Tree/MarkdownTree.hh        |   8 +
 18 files changed, 953 insertions(+), 41 deletions(-)

diff --git a/src/Titon/Console/Command.hh b/src/Titon/Console/Command.hh
index 70dbf34..337b929 100644
--- a/src/Titon/Console/Command.hh
+++ b/src/Titon/Console/Command.hh
@@ -11,19 +11,62 @@ use Titon\Console\InputDefinition\Argument;
 use Titon\Console\InputDefinition\Flag;
 use Titon\Console\InputDefinition\Option;
 
+/**
+ * A `Command` is a user-defined class that can to register user input and run
+ * using the input provided.
+ *
+ * @package Titon\Console
+ */
 interface Command {
 
+    /**
+     * The bootstrap method that sets up name, description, and necessary parameters
+     * for the `Command` to run.
+     *
+     * @return void
+     */
     public function configure(): void;
 
+    /**
+     * Retrieve all of the `Argument` objects registered specifically for this
+     * command.
+     *
+     * @return \Titon\Console\InputBag<Argument>
+     */
     public function getArguments(): InputBag<Argument>;
 
+    /**
+     * Retrieve the description of the `Command`.
+     *
+     * @return string
+     */
     public function getDescription(): string;
 
+    /**
+     * Retrieve all of the `Flag` objects registered specifically for this command.
+     *
+     * @return \Titon\Console\InputBag<Flag>
+     */
     public function getFlags(): InputBag<Flag>;
 
+    /**
+     * Retrieve the name of the `Command`.
+     *
+     * @return string
+     */
     public function getName(): string;
 
+    /**
+     * Retrieve all of the `Option` objects registered specifically for this command.
+     *
+     * @return \Titon\Console\InputBag<Option>
+     */
     public function getOptions(): InputBag<Option>;
 
+    /**
+     * The method that stores the code to be executed when the `Command` is run.
+     *
+     * @return void
+     */
     public function run(): void;
 }
\ No newline at end of file
diff --git a/src/Titon/Console/Command/AbstractCommand.hh b/src/Titon/Console/Command/AbstractCommand.hh
index b3aefc9..fa4ef89 100644
--- a/src/Titon/Console/Command/AbstractCommand.hh
+++ b/src/Titon/Console/Command/AbstractCommand.hh
@@ -14,20 +14,60 @@ use Titon\Console\InputDefinition\Argument;
 use Titon\Console\InputDefinition\Flag;
 use Titon\Console\InputDefinition\Option;
 
+/**
+ * A Command is a class that configures necessary command line inputs from the
+ * user and executes its `run` command when called.
+ *
+ * @package Titon\Console\Command
+ */
 abstract class AbstractCommand implements Command {
 
+    /**
+     * Bag container holding all registered `Argument` objects
+     *
+     * @var \Titon\Console\InputBag<Argument>
+     */
     protected InputBag<Argument> $arguments;
 
+    /**
+     * The `Input` object containing all registered and parsed command line
+     * parameters.
+     *
+     * @var \Titon\Console\Input
+     */
     protected Input $input;
 
+    /**
+     * The description of the command used when rendering its help screen.
+     *
+     * @var string
+     */
     protected string $description;
 
+    /**
+     * Bag container holding all registered `Flag` objects
+     *
+     * @var \Titon\Console\InputBag<Flag>
+     */
     protected InputBag<Flag> $flags;
 
+    /**
+     * The name of the command passed into the command line.
+     *
+     * @var string
+     */
     protected string $name;
 
+    /**
+     * Bag container holding all registered `Option` objects
+     *
+     * @var \Titon\Console\InputBag<Option>
+     */
     protected InputBag<Option> $options;
 
+    /**
+     * Construct a new instance of a command.
+     */
     public function __construct() {
         $this->input = new Input();
         $this->arguments = new InputBag();
@@ -35,24 +75,52 @@ abstract class AbstractCommand implements Command {
         $this->options = new InputBag();
     }
 
+    /**
+     * Add a new `Argument` to be registered and parsed with the `Input`.
+     *
+     * @param \Titon\Console\Argument $argument
+     *
+     * @return $this
+     */
     public function addArgument(Argument $argument): this {
         $this->arguments->set($argument->getName(), $argument);
 
         return $this;
     }
 
+    /**
+     * Add a new `Flag` to be registered and parsed with the `Input`.
+     *
+     * @param \Titon\Console\Flag $flag
+     *
+     * @return $this
+     */
     public function addFlag(Flag $flag): this {
         $this->flags->set($flag->getName(), $flag);
 
         return $this;
     }
 
+    /**
+     * Add a new `Option` to be registered and parsed with the `Input`.
+     *
+     * @param \Titon\Console\Option $option
+     *
+     * @return $this
+     */
     public function addOption(Option $option): this {
         $this->options->set($option->getName(), $option);
 
         return $this;
     }
 
+    /**
+     * Retrieve an `Argument` value by key.
+     *
+     * @param string $key
+     *
+     * @return mixed
+     */
     protected function getArgument(string $key): mixed {
         if ($argument = $this->input->getArgument($key)) {
             return $argument->getValue();
@@ -61,14 +129,31 @@ abstract class AbstractCommand implements Command {
         return null;
     }
 
+    /**
+     * Retrieve all `Argument` objects registered specifically to this command.
+     *
+     * @return \Titon\Console\InputBag<Argument>
+     */
     public function getArguments(): InputBag<Argument> {
         return $this->arguments;
     }
 
+    /**
+     * Retrieve the command's description.
+     *
+     * @return string
+     */
     public function getDescription(): string {
         return $this->description;
     }
 
+    /**
+     * Retrieve a `Flag` value by key.
+     *
+     * @param string $key
+     *
+     * @return mixed
+     */
     protected function getFlag(string $key): mixed {
         if ($flag = $this->input->getFlag($key)) {
             return $flag->getValue();
@@ -77,14 +162,31 @@ abstract class AbstractCommand implements Command {
         return null;
     }
 
+    /**
+     * Retrieve all `Flag` objects registered specifically to this command.
+     *
+     * @return \Titon\Console\InputBag<Flag>
+     */
     public function getFlags(): InputBag<Flag> {
         return $this->flags;
     }
 
+    /**
+     * Retrieve the command's name.
+     *
+     * @return  string
+     */
     public function getName(): string {
         return $this->name;
     }
 
+    /**
+     * Retrieve an `Option` value by key.
+     *
+     * @param string $key
+     *
+     * @return mixed
+     */
     protected function getOption(string $key): mixed {
         if ($option = $this->input->getOption($key)) {
             return $option->getValue();
@@ -93,10 +195,22 @@ abstract class AbstractCommand implements Command {
         return null;
     }
 
+    /**
+     * Retrieve all `Option` objects registered specifically to this command.
+     *
+     * @return \Titon\Console\InputBag<Option>
+     */
     public function getOptions(): InputBag<Option> {
         return $this->options;
     }
 
+    /**
+     * This method prepares the command for execution by registering all of its
+     * command-specific argumenets, flags, and options with the `Input` before
+     * parsing.
+     *
+     * @return $this
+     */
     public function registerInput(): this {
         foreach ($this->arguments as $name => $argument) {
             $this->input->addArgument($argument);
@@ -111,18 +225,39 @@ abstract class AbstractCommand implements Command {
         return $this;
     }
 
+    /**
+     * Set the command's description.
+     *
+     * @param string $description The description for the command
+     *
+     * @return $this
+     */
     public function setDescription(string $description): this {
         $this->description = $description;
 
         return $this;
     }
 
+    /**
+     * Set the `Input` objet for the commandd.
+     *
+     * @param \Titon\Console\Input $input The `Input` object
+     *
+     * @return $this
+     */
     public function setInput(Input $input): this {
         $this->input = $input;
 
         return $this;
     }
 
+    /**
+     * Set the command's name.
+     *
+     * @param string $name The name of the command
+     *
+     * @return $this
+     */
     public function setName(string $name): this {
         $this->name = $name;
 
diff --git a/src/Titon/Console/HelpScreen.hh b/src/Titon/Console/HelpScreen.hh
index d80e3ec..2ab875f 100644
--- a/src/Titon/Console/HelpScreen.hh
+++ b/src/Titon/Console/HelpScreen.hh
@@ -12,20 +12,64 @@ use Titon\Console\InputDefinition\Flag;
 use Titon\Console\InputDefinition\Option;
 use Titon\Console\InputDefinition\AbstractInputDefinition;
 
+/**
+ * The `HelpScreen` class renders out a usage screen given the available `Flag`,
+ * `Option`, and `Argument` objects avaiable as well as available commands that
+ * can be executed.
+ *
+ * @package Titon\Console
+ */
 class HelpScreen {
 
+    /**
+     * The available `Argument` objects accepted.
+     *
+     * @var \Titon\Console\InputBag<Argument>
+     */
     protected InputBag<Argument> $arguments;
 
+    /**
+     * The current `Command` the `HelpScreen` refers to.
+     *
+     * @var \Titon\Console\Command|null
+     */
     protected ?Command $command;
 
+    /**
+     * The available `Command` objects available.
+     *
+     * @var CommandMap
+     */
     protected CommandMap $commands;
 
+    /**
+     * The available `Flag` objects accepted.
+     *
+     * @var \Titon\Console\InputBag<Flag>
+     */
     protected InputBag<Flag> $flags;
 
+    /**
+     * The optional `name` of the application when not outputting a `HelpScreen`
+     * for a specific `Command`.
+     *
+     * @var string|null
+     */
     protected ?string $name;
 
+    /**
+     * The available `Option` objects accepted.
+     *
+     * @var \Titon\Console\InputBag<Option>
+     */
     protected InputBag<Option> $options;
 
+    /**
+     * Construct a new instance of the `HelpScreen`.
+     *
+     * @param \Titon\Console\Input $input   The `Input` to read all available
+     *                                      parameters from
+     */
     public function __construct(Input $input) {
         $this->commands = $input->getCommands();
         $this->arguments = $input->getArguments();
@@ -33,6 +77,11 @@ class HelpScreen {
         $this->options = $input->getOptions();
     }
 
+    /**
+     * Build and return the markup for the `HelpScreen`.
+     *
+     * @return string
+     */
     public function render(): string {
         $retval = Vector {};
 
@@ -64,6 +113,12 @@ class HelpScreen {
         return join($retval, "\n\n");
     }
 
+    /**
+     * Build the list of available `Command` objects that can be called and their
+     * descriptions.
+     *
+     * @return string
+     */
     protected function renderCommands(): string {
         ksort($this->commands);
 
@@ -118,6 +173,13 @@ class HelpScreen {
         return join($output, "\n");
     }
 
+    /**
+     * Build and return the markup for the heading of the `HelpScreen`. This is
+     * either the name of the application (when not rendering for a specific
+     * `Command`) or the name and description of the `Command`.
+     *
+     * @return string
+     */
     protected function renderHeading(): string {
         $retval = '';
 
@@ -138,6 +200,14 @@ class HelpScreen {
         return $retval;
     }
 
+    /**
+     * Build and return a specific section of available `Input` objects the user
+     * may specify.
+     *
+     * @param \Titon\Console\InputBag<T> $arguments The parameters to build information for
+     *
+     * @return string
+     */
     protected function renderSection<T as InputDefinition>(InputBag<T> $arguments): string {
         $entries = Map {};
         foreach ($arguments as $argument) {
@@ -172,6 +242,11 @@ class HelpScreen {
         return join($output, "\n");
     }
 
+    /**
+     * When rendering a for a `Command`, this method builds and returns the usage.
+     *
+     * @return string
+     */
     protected function renderUsage(): string {
         $usage = Vector {};
         if (!is_null($this->command)) {
@@ -221,30 +296,67 @@ class HelpScreen {
         return "Usage\n  " . join(" ", $usage);
     }
 
+    /**
+     * Set the `Argument` objects to render information for.
+     *
+     * @param \Titon\Console\InputBag<Argument> $arguments The `Argument` objects avaiable
+     *
+     * @return $this
+     */
     public function setArguments(InputBag<Argument> $arguments): this {
         $this->arguments = $arguments;
 
         return $this;
     }
 
+    /**
+     * Set the `Command` to render a the help screen for.
+     *
+     * @param \Titon\Console\InputBag<Argument> $arguments The `Command` object
+     *
+     * @return $this
+     */
     public function setCommand(Command $command): this {
         $this->command = $command;
 
         return $this;
     }
 
+    /**
+     * Set the `Command` objects to render information for.
+     *
+     * @param \Titon\Console\CommandMap $arguments The `Command` objects avaiable
+     *
+     * @return $this
+     */
     public function setCommands(CommandMap $commands): this {
         $this->commands = $commands;
 
         return $this;
     }
 
+    /**
+     * Set the `Flag` objects to render information for.
+     *
+     * @param \Titon\Console\InputBag<Flag> $arguments The `Flag` objects avaiable
+     *
+     * @return $this
+     */
     public function setFlags(InputBag<Flag> $flags): this {
         $this->flags = $flags;
 
         return $this;
     }
 
+    /**
+     * Set the `Input` the help screen should read all avaiable parameters and
+     * commands from.
+     *
+     * @param \Titon\Console\Input $input   The `Input` object with all available
+     *                                      parameters and commands
+     *
+     * @return $this
+     */
     public function setInput(Input $input): this {
         $this->commands = $input->getCommands();
         $this->arguments = $input->getArguments();
@@ -254,12 +366,26 @@ class HelpScreen {
         return $this;
     }
 
+    /**
+     * Set the name of the application
+     *
+     * @param string $name  The name (and other information) of the console application
+     *
+     * @return $this
+     */
     public function setName(string $name): this {
         $this->name = $name;
 
         return $this;
     }
 
+    /**
+     * Set the `Option` objects to render information for.
+     *
+     * @param \Titon\Console\InputBag<Option> $arguments The `Option` objects avaiable
+     *
+     * @return $this
+     */
     public function setOptions(InputBag<Option> $options): this {
         $this->options = $options;
 
diff --git a/src/Titon/Console/Input.hh b/src/Titon/Console/Input.hh
index 9edae5a..78df7f1 100644
--- a/src/Titon/Console/Input.hh
+++ b/src/Titon/Console/Input.hh
@@ -15,29 +15,78 @@ use Titon\Console\InputDefinition\Option;
 use Titon\Console\Exception\MissingValueException;
 use Titon\Console\Exception\InvalidCommandException;
 
-
+/**
+ * The `Input` class contains all available `Flag`, `Argument`, `Option`, and
+ * `Command` objects available to parse given the provided input.
+ *
+ * @package Titon\Console
+ */
 class Input {
 
+    /**
+     * Bag container holding all registered `Argument` objects
+     *
+     * @var \Titon\Console\InputBag<Argument>
+     */
     protected InputBag<Argument> $arguments;
 
+    /**
+     * The `Command` (if any) that is parsed from the provided input.
+     *
+     * @var \Titon\Console\Command
+     */
     protected ?Command $command;
 
+    /**
+     * All available `Command` candidates to parse from the input.
+     *
+     * @var \Titon\Console\CommandMap
+     */
     protected CommandMap $commands = Map {};
 
+    /**
+     * Bag container holding all registered `Flag` objects
+     *
+     * @var \Titon\Console\InputBag<Flag>
+     */
     protected InputBag<Flag> $flags;
 
+    /**
+     * The `InputLexer` that will traverse and help parse the provided input.
+     *
+     * @var \Titon\Console\InputLexer
+     */
     protected InputLexer $input;
 
+    /**
+     * All parameters provided in the input that do not match a given `Command`
+     * or `InputDefinition`.
+     *
+     * @var Vector<\Titon\Console\RawInput>
+     */
     protected Vector<RawInput> $invalid = Vector {};
 
+    /**
+     * Bag container holding all registered `Option` objects
+     *
+     * @var \Titon\Console\InputBag<Option>
+     */
     protected InputBag<Option> $options;
 
+    /**
+     * The 'strict' value of the `Input` object. If set to `true`, then any invalid
+     * parameters found in the input will throw an exception.
+     *
+     * @var bool
+     */
+    protected bool $strict = false;
+
     /**
      * Construct a new instance of Input
      *
      * @param ?array<mixed> $args
      */
-    public function __construct(?array<string> $args = null) {
+    public function __construct(?array<string> $args = null, bool $strict = false) {
         if (is_null($args)) {
             $args = array_slice(Server::get('argv'), 1);
         }
@@ -46,12 +95,13 @@ class Input {
         $this->flags = new InputBag();
         $this->options = new InputBag();
         $this->arguments = new InputBag();
+        $this->strict = $strict;
     }
 
     /**
      * Add a new `Argument` candidate to be parsed from input.
      *
-     * @param Argument $argument
+     * @param \Titon\Console\Argument $argument The `Argument` to add
      *
      * @return $this
      */
@@ -61,6 +111,13 @@ class Input {
         return $this;
     }
 
+    /**
+     * Add a new `Command` candidate to be parsed from input.
+     *
+     * @param \Titon\Console\Command $command   The `Command` to add
+     *
+     * @return $this
+     */
     public function addCommand(Command $command): this {
         $command->configure();
         $this->commands[$command->getName()] = $command;
@@ -71,7 +128,7 @@ class Input {
     /**
      * Add a new `Flag` candidate to be parsed from input.
      *
-     * @param Flag $flag
+     * @param \Titon\Console\Flag $flag The `Flag` to add
      *
      * @return $this
      */
@@ -84,7 +141,7 @@ class Input {
     /**
      * Add a new `Option` candidate to be parsed from input.
      *
-     * @param Option $option
+     * @param \Titon\Console\Option $option The `Option` to add
      *
      * @return $this
      */
@@ -99,7 +156,7 @@ class Input {
      *
      * @param string $key The key or alias of the `Argument`
      *
-     * @return Argument|null
+     * @return \Titon\Console\Argument|null
      */
     public function getArgument(string $key): ?Argument {
         return $this->arguments->get($key);
@@ -108,16 +165,28 @@ class Input {
     /**
      * Retrieve all `Argument` candidates.
      *
-     * @return InputBag<Argument>
+     * @return \Titon\Console\InputBag<Argument>
      */
     public function getArguments(): InputBag<Argument> {
         return $this->arguments;
     }
 
-    public function getCommand(string $key): ?Command {
-        return $this->commands->get($key);
+    /**
+     * Retrieve a `Command` candidate by its name.
+     *
+     * @param string $key   The name of the `Command`
+     *
+     * @return \Titon\Console\Command|null
+     */
+    public function getCommand(string $name): ?Command {
+        return $this->commands->get($name);
     }
 
+    /**
+     * Retrieve all `Command` candidates.
+     *
+     * @return \Titon\Console\CommandMap
+     */
     public function getCommands(): CommandMap {
         return $this->commands;
     }
@@ -127,7 +196,7 @@ class Input {
      *
      * @param string $key The key or alias of the `Flag`
      *
-     * @return Flag|null
+     * @return \Titon\Console\Flag|null
      */
     public function getFlag(string $key): ?Flag {
         return $this->flags->get($key);
@@ -136,24 +205,18 @@ class Input {
     /**
      * Retrieve all `Flag` candidates.
      *
-     * @return InputBag<Flag>
+     * @return \Titon\Console\InputBag<Flag>
      */
     public function getFlags(): InputBag<Flag> {
         return $this->flags;
     }
 
-    public function setInput(array<string> $args): this {
-        $this->input = new InputLexer($args);
-
-        return $this;
-    }
-
     /**
      * Retrieve an `Option` by its key or alias. Returns null if none exists.
      *
      * @param string $key The key or alias of the `Option`
      *
-     * @return Option|null
+     * @return \Titon\Console\Option|null
      */
     public function getOption(string $key): ?Option {
         return $this->options->get($key);
@@ -162,12 +225,21 @@ class Input {
     /**
      * Retrieve all `Option` candidates.
      *
-     * @return InputBag<Option>
+     * @return \Titon\Console\InputBag<Option>
      */
     public function getOptions(): InputBag<Option> {
         return $this->options;
     }
 
+    /**
+     * Return whether the `Input` is running in `strict` mode or not.
+     *
+     * @return bool
+     */
+    public function getStrict(): bool {
+        return $this->strict;
+    }
+
     /**
      * Parse input for all `Flag`, `Option`, and `Argument` candidates.
      *
@@ -193,7 +265,7 @@ class Input {
      * Determine if a RawInput matches an `Argument` candidate. If so, save its
      * value.
      *
-     * @param RawInput $key
+     * @param \Titon\Console\RawInput $key
      *
      * @return bool
      */
@@ -224,7 +296,7 @@ class Input {
      * Determine if a RawInput matches a `Flag` candidate. If so, save its
      * value.
      *
-     * @param RawInput $key
+     * @param \Titon\Console\RawInput $key
      *
      * @return bool
      */
@@ -259,7 +331,7 @@ class Input {
      * Determine if a RawInput matches an `Option` candidate. If so, save its
      * value.
      *
-     * @param RawInput $key
+     * @param \Titon\Console\RawInput $key
      *
      * @return bool
      */
@@ -296,4 +368,30 @@ class Input {
 
         return true;
     }
+
+    /**
+     * Set the input to be parsed.
+     *
+     * @param array<string> $args   The input to be parsed
+     *
+     * @return $this
+     */
+    public function setInput(array<string> $args): this {
+        $this->input = new InputLexer($args);
+
+        return $this;
+    }
+
+    /**
+     * Set the strict value of the `Input`
+     *
+     * @param bool $strict  Boolean if the `Input` should run strictly or not
+     *
+     * @return $this
+     */
+    public function setStrict(bool $strict): this {
+        $this->strict = $strict;
+
+        return $this;
+    }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/InputBag.hh b/src/Titon/Console/InputBag.hh
index a2c6495..36358e7 100644
--- a/src/Titon/Console/InputBag.hh
+++ b/src/Titon/Console/InputBag.hh
@@ -9,8 +9,23 @@ namespace Titon\Console;
 
 use Titon\Common\Bag\AbstractBag;
 
+/**
+ * The `InputBag` holds available `InputDefinition` objects to reference.
+ *
+ * @package Titon\Console
+ */
 class InputBag<T as InputDefinition> extends AbstractBag<string, T> {
 
+    /**
+     * Retrieve the `InputDefinition` object based on the given key. The key is
+     * checked against all available names as well as aliases.
+     *
+     * @param string $key   The key to match
+     * @param T $default    The default value to return if no `InputDefinition`
+     *                      is found
+     *
+     * @return T|null
+     */
     public function get(string $key, ?T $default = null): ?T {
         $arg = null;
         if (is_null($arg = parent::get($key))) {
diff --git a/src/Titon/Console/InputDefinition.hh b/src/Titon/Console/InputDefinition.hh
index 830a741..1b9dcbd 100644
--- a/src/Titon/Console/InputDefinition.hh
+++ b/src/Titon/Console/InputDefinition.hh
@@ -7,17 +7,54 @@
 
 namespace Titon\Console;
 
+/**
+ * An `InputDefinition` defines the name and type of input that may be accepted
+ * by the user.
+ *
+ * @package Titon\Console
+ */
 interface InputDefinition {
 
+    /**
+     * Retrieve the alias of the `InputDefinition`.
+     *
+     * @return string
+     */
     public function getAlias(): string;
 
+    /**
+     * Retrieve the description of the `InputDefinition`.
+     *
+     * @return string
+     */
     public function getDescription(): string;
 
+    /**
+     * Retrieve the formatted name suitable for output in a help screen or
+     * documentation.
+     *
+     * @return string
+     */
     public function getFormattedName(string $name): string;
 
+    /**
+     * Retrieve the mode of the `InputDefinition`.
+     *
+     * @return string
+     */
     public function getMode(): int;
 
+    /**
+     * Retrieve the name of the `InputDefinition`.
+     *
+     * @return string
+     */
     public function getName(): string;
 
+    /**
+     * Retrieve the value of the `InputDefinition` as specified by the user.
+     *
+     * @return mixed
+     */
     public function getValue(): mixed;
 }
\ No newline at end of file
diff --git a/src/Titon/Console/InputDefinition/Argument.hh b/src/Titon/Console/InputDefinition/Argument.hh
index b375e7f..04674a3 100644
--- a/src/Titon/Console/InputDefinition/Argument.hh
+++ b/src/Titon/Console/InputDefinition/Argument.hh
@@ -7,13 +7,28 @@
 
 namespace Titon\Console\InputDefinition;
 
+/**
+ * An `Argument` is a parameter specified by the user that does not use any
+ * notation (i.e., --foo, -f).
+ *
+ * @package Titon\Console\InputDefinition
+ */
 class Argument extends AbstractInputDefinition {
 
-    <<Override>>
-    public function getFormattedName(string $name): string {
+    /**
+     * {@inheritdoc}
+     */
+    <<Override>> public function getFormattedName(string $name): string {
         return $name;
     }
 
+    /**
+     * Set the value of the `Argument`.
+     *
+     * @param string $value The value given to the `Argument`
+     *
+     * @return $this
+     */
     public function setValue(string $value): this {
         $this->value = $value;
 
diff --git a/src/Titon/Console/InputDefinition/Flag.hh b/src/Titon/Console/InputDefinition/Flag.hh
index 153705e..b3f6384 100644
--- a/src/Titon/Console/InputDefinition/Flag.hh
+++ b/src/Titon/Console/InputDefinition/Flag.hh
@@ -7,12 +7,36 @@
 
 namespace Titon\Console\InputDefinition;
 
+/**
+ * A `Flag` is a boolean parameter (denoted by an integer) specified by a user.
+ *
+ * @package Titon\Console\InputDefinition
+ */
 class Flag extends AbstractInputDefinition {
 
+    /**
+     * The negative alias of the `Flag` (i.e., --no-foo for -foo). A negative
+     * value is only available if a 'long' `Flag` name is available.
+     *
+     * @var ?string
+     */
     protected ?string $negativeAlias;
 
+    /**
+     * Whether the flag is stackable or not (i.e., -fff is given a value of 3).
+     *
+     * @var bool
+     */
     protected bool $stackable = false;
 
+    /**
+     * Construct a new `Flag` object
+     *
+     * @param string $name          The name the flag should be specified with
+     * @param string $description   The description of the flag
+     * @param int    $mode          The mode of the flag
+     * @param bool   $stackable     Whether the flag is stackable or not
+     */
     public function __construct(string $name, string $description = '', int $mode = self::MODE_OPTIONAL, bool $stackable = false) {
         parent::__construct($name, $description, $mode);
 
@@ -24,10 +48,21 @@ class Flag extends AbstractInputDefinition {
         $this->stackable = $stackable;
     }
 
+    /**
+     * Retrieve the negative alias of the `Flag` or null of none.
+     *
+     * @return string|null
+     */
     public function getNegativeAlias(): ?string {
         return $this->negativeAlias;
     }
 
+    /**
+     * If the `Flag` is stackable, increase its value for each occurrence of the
+     * flag.
+     *
+     * @return $this
+     */
     public function increaseValue(): this {
         if ($this->stackable) {
             if (is_null($this->value)) {
@@ -42,10 +77,24 @@ class Flag extends AbstractInputDefinition {
         return $this;
     }
 
+    /**
+     * Retrieve whether the `Flag` is stackable or not.
+     *
+     * @return bool
+     */
     public function isStackable(): bool {
         return $this->stackable;
     }
 
+    /**
+     * Set an alias for the `Flag`. If the 'name' given at construction is a short
+     * name and the alias set is long, the 'alias' given here will serve as the
+     * 'name' and the original name will be set to the 'alias'.
+     *
+     * @param string $alias The alias for the `Flag`
+     *
+     * @return $this
+     */
     public function setAlias(string $alias): this {
         parent::setAlias($alias);
 
@@ -56,12 +105,39 @@ class Flag extends AbstractInputDefinition {
         return $this;
     }
 
+    /**
+     * Set the default value for the `Flag` if no value is give.
+     *
+     * @param int $default  The default value
+     *
+     * @return $this
+     */
+    public function setDefault(int $default): this {
+        $this->default = $default;
+
+        return $this;
+    }
+
+    /**
+     * Set whether the `Flag` is stackable or not.
+     *
+     * @param bool $stackable
+     *
+     * @return $this
+     */
     public function setStackable(bool $stackable): this {
         $this->stackable = $stackable;
 
         return $this;
     }
 
+    /**
+     * Set the value of the `Flag`.
+     *
+     * @param int $value The value given to the `Flag`
+     *
+     * @return $this
+     */
     public function setValue(int $value): this {
         $this->value = $value;
 
diff --git a/src/Titon/Console/InputDefinition/Option.hh b/src/Titon/Console/InputDefinition/Option.hh
index bf71613..6a3590c 100644
--- a/src/Titon/Console/InputDefinition/Option.hh
+++ b/src/Titon/Console/InputDefinition/Option.hh
@@ -7,14 +7,33 @@
 
 namespace Titon\Console\InputDefinition;
 
+/**
+ * A `Flag` is a value parameter specified by a user.
+ *
+ * @package Titon\Console\InputDefinition
+ */
 class Option extends AbstractInputDefinition {
 
+    /**
+     * Set the default value for the `Option` if no value is give.
+     *
+     * @param int $default  The default value
+     *
+     * @return $this
+     */
     public function setDefault(string $default): this {
         $this->default = $default;
 
         return $this;
     }
 
+    /**
+     * Set the value of the `Option`.
+     *
+     * @param string $value The value given to the `Option`
+     *
+     * @return $this
+     */
     public function setValue(string $value): this {
         $this->value = $value;
 
diff --git a/src/Titon/Console/InputLexer.hh b/src/Titon/Console/InputLexer.hh
index 3e7c69b..b983777 100644
--- a/src/Titon/Console/InputLexer.hh
+++ b/src/Titon/Console/InputLexer.hh
@@ -7,20 +7,56 @@
 
 namespace Titon\Console;
 
+use Iterator;
 use Titon\Common\ArgumentList;
 
+/**
+ * The `InputLexer` handles all parsing and pairing of the provided input.
+ *
+ * @package Titon\Console
+ */
 class InputLexer implements Iterator<RawInput> {
 
+    /**
+     * Data structure of all items that have yet to be retrieved.
+     *
+     * @var array<string>
+     */
     public array<string> $items;
 
+    /**
+     * The current position in the `items` of the lexer.
+     *
+     * @var int
+     */
     protected int $position = 0;
 
+    /**
+     * The current length of avaiable values remaining in the lexer.
+     *
+     * @var int
+     */
     protected int $length = 0;
 
+    /**
+     * The current value the lexer is pointing to.
+     *
+     * @var \Titon\Console\RawInput
+     */
     protected RawInput $current;
 
+    /**
+     * Whether the lexer is on its first item or not.
+     *
+     * @var bool
+     */
     protected bool $first = true;
 
+    /**
+     * Construct a new `InputLexer` given the provided structure of inputs.
+     *
+     * @param array<string> $items  The items to traverse through
+     */
     public function __construct(array<string> $items) {
         $this->items = $items;
         $this->length = count($items);
@@ -30,14 +66,31 @@ class InputLexer implements Iterator<RawInput> {
         );
     }
 
+    /**
+     * Retrieve the current item the lexer is pointing to.
+     *
+     * @return \Titon\Console\RawInput
+     */
     public function current(): RawInput {
         return $this->current;
     }
 
+    /**
+     * Return whether the lexer has reached the end of its parsable items or not.
+     *
+     * @return bool
+     */
     public function end(): bool {
         return ($this->position + 1) == $this->length;
     }
 
+    /**
+     * If the current item is a string of short input values or the string contains
+     * a value a flag is representing, separate them and add them to the available
+     * items to parse.
+     *
+     * @return void
+     */
     private function explode(): void {
         if (!$this->isShort($this->current['raw']) || strlen($this->current['value']) <= 1) {
             return;
@@ -55,28 +108,64 @@ class InputLexer implements Iterator<RawInput> {
         }
     }
 
+    /**
+     * Return whether the given value is representing notation for an argument.
+     *
+     * @param string $value The value to check
+     *
+     * @return bool
+     */
     public function isArgument(string $value): bool {
         return $this->isShort($value) || $this->isLong($value);
     }
 
+    /**
+     * Determine if the given value is representing a long argument (i.e., --foo).
+     *
+     * @param string $value The value to check
+     *
+     * @return bool
+     */
     public function isLong(string $value): bool {
          return (0 == strncmp($value, '--', 2));
     }
 
+    /**
+     * Determine if the given value is representing a short argument (i.e., -f).
+     *
+     * @param string $value The value to check
+     *
+     * @return bool
+     */
     public function isShort(string $value): bool {
         return !$this->isLong($value) && (0 == strncmp($value, '-', 1));
     }
 
+    /**
+     * Retrieve the current position of the lexer.
+     *
+     * @return int
+     */
     public function key(): int {
         return $this->position;
     }
 
+    /**
+     * Progress the lexer to its next item (if available).
+     *
+     * @return void
+     */
     public function next(): void {
         if ($this->valid()) {
             $this->shift();
         }
     }
 
+    /**
+     * Peek ahead to the next avaiable item without progressing the lexer.
+     *
+     * @return \Titon\Console\RawInput|null
+     */
     public function peek(): ?RawInput {
         if (count($this->items) > 0) {
             return $this->processInput($this->items[0]);
@@ -85,6 +174,13 @@ class InputLexer implements Iterator<RawInput> {
         return null;
     }
 
+    /**
+     * Create and return RawInput given a raw string value.
+     *
+     * @param string $input The value to create RawInput for
+     *
+     * @return \Titon\Console\RawInput
+     */
     public function processInput(string $input): RawInput {
         $raw = $input;
         $value = $input;
@@ -103,6 +199,9 @@ class InputLexer implements Iterator<RawInput> {
         );
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function rewind(): void {
         $this->shift();
         if ($this->first) {
@@ -111,6 +210,13 @@ class InputLexer implements Iterator<RawInput> {
         }
     }
 
+    /**
+     * Progress the lexer to its next avaiable item. If the item contains a value
+     * an argument is representing, separate them and add the value back to the
+     * available items to parse.
+     *
+     * @return void
+     */
     public function shift(): void {
         $key = array_shift($this->items);
 
@@ -131,11 +237,23 @@ class InputLexer implements Iterator<RawInput> {
         $this->explode();
     }
 
+    /**
+     * Add an item back to the items that have yet to be parsed.
+     *
+     * @param string $item  The item to add
+     *
+     * @return void
+     */
     public function unshift(string $item): void {
         array_unshift($this->items, $item);
         $this->length++;
     }
 
+    /**
+     * Return whether or not the lexer has any more items to parse.
+     *
+     * @return bool
+     */
     public function valid(): bool {
         return ($this->position < $this->length);
     }
diff --git a/src/Titon/Console/Table.hh b/src/Titon/Console/Table.hh
index 74e617c..ea979b1 100644
--- a/src/Titon/Console/Table.hh
+++ b/src/Titon/Console/Table.hh
@@ -7,11 +7,37 @@
 
 namespace Titon\Console;
 
+/**
+ * A `Table` object will construct the markup for a human readable (or otherwise
+ * parsable) representation of tabular data.
+ *
+ * @package Titon\Console
+ */
 interface Table {
 
-    public function addRow(Vector<string> $row): this;
+    /**
+     * Add a row of data to the end of the existing data.
+     *
+     * @param Vector<mixed> $row    A Vector containing the row of data
+     *
+     * @return $this
+     */
+    public function addRow(Vector<mixed> $row): this;
 
+    /**
+     * Build and return the markup for the `Table`.
+     *
+     * @return string
+     */
     public function render(): string;
 
-    public function setRows(Vector<Vector<string>> $rows): this;
+    /**
+     * Set the data for the rows in the table with a Vector containing a Vector
+     * for each row in the table.
+     *
+     * @param Vector<Vector<mixed> The Vector containin the row data
+     *
+     * @return $this
+     */
+    public function setRows(Vector<Vector<mixed>> $rows): this;
 }
\ No newline at end of file
diff --git a/src/Titon/Console/Table/AbstractTable.hh b/src/Titon/Console/Table/AbstractTable.hh
index 2c1187d..a4ab6c1 100644
--- a/src/Titon/Console/Table/AbstractTable.hh
+++ b/src/Titon/Console/Table/AbstractTable.hh
@@ -9,22 +9,58 @@ namespace Titon\Console\Table;
 
 use Titon\Console\Table;
 
+/**
+ * The `AbstractTable` class provides the core functionality for building and
+ * displaying tabular data.
+ *
+ * @package Titon\Console\Table
+ */
 abstract class AbstractTable implements Table {
 
+    /**
+     * Data structure that holds the width of each column.
+     *
+     * @var Vector<int>
+     */
     protected Vector<int> $columnWidths = Vector {};
 
+    /**
+     * Data structure holding the header names of each column.
+     *
+     * @var Vector<string>
+     */
     protected Vector<string> $headers = Vector {};
 
-    protected Vector<Vector<string>> $rows = Vector {};
-
-    public function addRow(Vector<string> $row): this {
+    /**
+     * Data structure holding the data for each row in the table.
+     *
+     * @var Vector<Vector<string>>
+     */
+    protected Vector<Vector<mixed>> $rows = Vector {};
+
+    /**
+     * Append a new row of data to the end of the existing rows.
+     *
+     * @param Vector<string> $row   Vector containing the row data
+     *
+     * @return $this
+     */
+    public function addRow(Vector<mixed> $row): this {
         $this->setColumnWidths($row);
         $this->rows[] = $row;
 
         return $this;
     }
 
-    public function setColumnWidths(Vector<string> $row): void {
+    /**
+     * Given the row of data, adjust the column width accordingly so that the
+     * columns width is that of the maximum data field size.
+     *
+     * @param Vector<string> $row   Vector containing the row data
+     *
+     * @return $this
+     */
+    protected function setColumnWidths(Vector<mixed> $row): void {
         foreach ($row as $index => $value) {
             $width = strlen($value);
             if (is_null($currentWidth = $this->columnWidths->get($index)) || $width > $currentWidth) {
@@ -37,7 +73,16 @@ abstract class AbstractTable implements Table {
         }
     }
 
-    public function setData(Vector<Map<string, string>> $data): this {
+    /**
+     * Set the data of the table with a Vector of column name and value Maps.
+     * This method overwrites any existing rows in the table.
+     *
+     * @param Vector<Map<string, string>> $data A Vector containing Maps of column
+     *                                          name and data key-value pairs.
+     *
+     * @return $this
+     */
+    public function setData(Vector<Map<string, mixed>> $data): this {
         $rows = Vector {};
         $headers = Vector {};
         foreach ($data as $row) {
@@ -56,6 +101,13 @@ abstract class AbstractTable implements Table {
         return $this;
     }
 
+    /**
+     * Set the column names for the table.
+     *
+     * @param Vector<string> $headers   A Vector containing column names
+     *
+     * @return $this
+     */
     public function setHeaders(Vector<string> $headers): this {
         $this->setColumnWidths($headers);
         $this->headers = $headers;
@@ -63,7 +115,10 @@ abstract class AbstractTable implements Table {
         return $this;
     }
 
-    public function setRows(Vector<Vector<string>> $rows): this {
+    /**
+     * {@inheritdoc}
+     */
+    public function setRows(Vector<Vector<mixed>> $rows): this {
         $this->rows->clear();
         foreach ($rows as $row) {
             $this->addRow($row);
diff --git a/src/Titon/Console/Table/AsciiTable.hh b/src/Titon/Console/Table/AsciiTable.hh
index ae17936..fec7fac 100644
--- a/src/Titon/Console/Table/AsciiTable.hh
+++ b/src/Titon/Console/Table/AsciiTable.hh
@@ -7,10 +7,26 @@
 
 namespace Titon\Console\Table;
 
+/**
+ * The `AsciiTable` object with output a human readable ASCII table in of the
+ * provided data.
+ *
+ * @package Titon\Console\Table
+ */
 class AsciiTable extends AbstractTable {
 
+    /**
+     * A string containing the output for a border.
+     *
+     * @var string
+     */
     protected ?string $border;
 
+    /**
+     * A Map containing necessary characters used for building the table.
+     *
+     * @var Map<string, string>
+     */
     protected Map<string, string> $characters = Map {
         'corner' => '+',
         'line' => '-',
@@ -19,13 +35,33 @@ class AsciiTable extends AbstractTable {
         'padding' => ' ',
     };
 
+    /**
+     * The integer length of the width each row should be.
+     *
+     * @var ?int
+     */
     protected ?int $rowWidth;
 
+    /**
+     * Given a string value and a padding string, return the value with the pad
+     * appended and prepended to the value.
+     *
+     * @param string $value The value to pad
+     * @param string $pad   The string of characters to pad the value with
+     *
+     * @return string
+     */
     protected function pad(string $value, string $pad = ''): string {
         return "$pad$value$pad";
     }
 
-    protected function buildBorder(bool $header = false): string {
+    /**
+     * Build a border for the width of the row width for the class and using the
+     * class's `characters`.
+     *
+     * @return string
+     */
+    protected function buildBorder(): string {
         if (is_null($this->border)) {
             $this->border = '+';
             foreach ($this->columnWidths as $width) {
@@ -39,11 +75,27 @@ class AsciiTable extends AbstractTable {
         return $this->border;
     }
 
+    /**
+     * Build a single cell of the table given the data and the key of the column
+     * the data should go into.
+     *
+     * @param string $value The value of the cell
+     * @param int    $key   The index of the column
+     *
+     * @return string
+     */
     protected function buildCell(string $value, int $key): string {
         return $this->pad(str_pad($value, $this->columnWidths->get($key)), $this->characters['padding']);
     }
 
-    protected function buildRow(Vector<string> $data): string {
+    /**
+     * Given a Vector of data, build a single row of the table.
+     *
+     * @param Vector<mixed> The row data
+     *
+     * @return string
+     */
+    protected function buildRow(Vector<mixed> $data): string {
         $row = [];
         foreach ($data as $index => $value) {
             $row[] = $this->buildCell($value, $index);
@@ -53,6 +105,11 @@ class AsciiTable extends AbstractTable {
         return $row;
     }
 
+    /**
+     * Retrieve the width that each row in the table should be.
+     *
+     * @return int
+     */
     protected function getRowWidth(): int {
         if (is_null($this->rowWidth)) {
             if (!is_null($this->rows[0])) {
@@ -63,6 +120,11 @@ class AsciiTable extends AbstractTable {
         return $this->rowWidth;
     }
 
+    /**
+     * Build the table and return its markup.
+     *
+     * @return string
+     */
     public function render(): string {
         $retval = Vector {};
 
diff --git a/src/Titon/Console/Table/TabDelimitedTable.hh b/src/Titon/Console/Table/TabDelimitedTable.hh
index 9c46642..4fc1351 100644
--- a/src/Titon/Console/Table/TabDelimitedTable.hh
+++ b/src/Titon/Console/Table/TabDelimitedTable.hh
@@ -7,8 +7,19 @@
 
 namespace Titon\Console\Table;
 
+/**
+ * The `TabDelimitedTable` class builds and outputs a table with values tab-delimited
+ * for use in other applications.
+ *
+ * @package Titon\Console\Table
+ */
 class TabDelimitedTable extends AbstractTable {
 
+    /**
+     * Build the table and return its markup.
+     *
+     * @return string
+     */
     public function render(): string {
         $retval = Vector {};
 
diff --git a/src/Titon/Console/Tree.hh b/src/Titon/Console/Tree.hh
index d786b7f..695447a 100644
--- a/src/Titon/Console/Tree.hh
+++ b/src/Titon/Console/Tree.hh
@@ -7,11 +7,33 @@
 
 namespace Titon\Console;
 
+/**
+ * A `Tree` object will construct the markup for a human readable of nested data.
+ *
+ * @package Titon\Console
+ */
 interface Tree {
 
-    public function getData(): array<string>;
+    /**
+     * Retrieve the data structure of the `Tree`.
+     *
+     * @return array<mixed>
+     */
+    public function getData(): array<mixed>;
 
+    /**
+     * Build and return the markup for the `Tree`.
+     *
+     * @return string
+     */
     public function render(): string;
 
-    public function setData(array<string> $data): this;
+    /**
+     * Set the data for the tree.
+     *
+     * @param array<mixed> $data    The data for the tree
+     *
+     * @return $this
+     */
+    public function setData(array<mixed> $data): this;
 }
\ No newline at end of file
diff --git a/src/Titon/Console/Tree/AbstractTree.hh b/src/Titon/Console/Tree/AbstractTree.hh
index cbe66bd..cff3cf4 100644
--- a/src/Titon/Console/Tree/AbstractTree.hh
+++ b/src/Titon/Console/Tree/AbstractTree.hh
@@ -9,25 +9,63 @@ namespace Titon\Console\Tree;
 
 use Titon\Console\Tree;
 
+/**
+ * The `AbstractTree` class provides core functionality for building a tree given
+ * a data structure.
+ *
+ * @package Titon\Console\Tree
+ */
 abstract class AbstractTree implements Tree {
 
-    protected array<string> $data = [];
+    /**
+     * The data for the tree.
+     *
+     * @var array<mixed>
+     */
+    protected array<mixed> $data = [];
 
-    public function __construct(array<string> $data = []) {
+    /**
+     * Construct a new instance of a tree.
+     *
+     * @param array<mixed> $data    The data to render
+     */
+    public function __construct(array<mixed> $data = []) {
         $this->data = $data;
     }
 
-    abstract protected function build(array<string> $tree, string $prefix = ''): string;
+    /**
+     * Recursively build the tree and each branch and prepend necessary markup
+     * for the output.
+     *
+     * @param array<mixed> $tree    The tree or branch to build
+     * @param string $prefix        The markup prefix for the tree / branch
+     *
+     * @retun string
+     */
+    abstract protected function build(array<mixed> $tree, string $prefix = ''): string;
 
-    public function getData(): array<string> {
+    /**
+     * Retrieve the data of the tree.
+     *
+     * @return array<mixed>
+     */
+    public function getData(): array<mixed> {
         return $this->data;
     }
 
+    /**
+     * Render the tree.
+     *
+     * @return string
+     */
     public function render(): string {
         return $this->build($this->data);
     }
 
-    public function setData(array<string> $data): this {
+    /**
+     * {@inheritdoc}
+     */
+    public function setData(array<mixed> $data): this {
         $this->data = $data;
 
         return $this;
diff --git a/src/Titon/Console/Tree/AsciiTree.hh b/src/Titon/Console/Tree/AsciiTree.hh
index 60ac40c..6e31ff3 100644
--- a/src/Titon/Console/Tree/AsciiTree.hh
+++ b/src/Titon/Console/Tree/AsciiTree.hh
@@ -7,8 +7,16 @@
 
 namespace Titon\Console\Tree;
 
+/**
+ * Build a human readable ASCII tree given an infinitely nested data structure.
+ *
+ * @package Titon\Console\Tree
+ */
 class AsciiTree extends AbstractTree {
 
+    /**
+     * {@inheritdoc}
+     */
     protected function build(array<string> $tree, string $prefix = ''): string {
         if (is_null($tree)) {
             $tree = $this->data;
diff --git a/src/Titon/Console/Tree/MarkdownTree.hh b/src/Titon/Console/Tree/MarkdownTree.hh
index 9038c57..0b9c7eb 100644
--- a/src/Titon/Console/Tree/MarkdownTree.hh
+++ b/src/Titon/Console/Tree/MarkdownTree.hh
@@ -7,8 +7,16 @@
 
 namespace Titon\Console\Tree;
 
+/**
+ * Build a tree given an infinitely nested data structure using Markdown syntax.
+ *
+ * @package Titon\Console\Tree
+ */
 class MarkdownTree extends AbstractTree {
 
+    /**
+     * {@inheritdoc}
+     */
     protected function build(array<string> $tree, string $prefix = ''): string {
         if (is_null($tree)) {
             $tree = $this->data;

From c91101ff7625d3294414d210459862aed2367fce Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 3 Mar 2015 22:25:36 -0500
Subject: [PATCH 26/92] fixed some type check issues

---
 src/Titon/Console/Table/AsciiTable.hh  |  2 +-
 src/Titon/Console/Tree.hh              |  4 ++--
 src/Titon/Console/Tree/AbstractTree.hh | 10 +++++-----
 src/Titon/Console/Tree/AsciiTree.hh    |  8 ++++----
 src/Titon/Console/Tree/MarkdownTree.hh |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Titon/Console/Table/AsciiTable.hh b/src/Titon/Console/Table/AsciiTable.hh
index fec7fac..b90ea9c 100644
--- a/src/Titon/Console/Table/AsciiTable.hh
+++ b/src/Titon/Console/Table/AsciiTable.hh
@@ -98,7 +98,7 @@ class AsciiTable extends AbstractTable {
     protected function buildRow(Vector<mixed> $data): string {
         $row = [];
         foreach ($data as $index => $value) {
-            $row[] = $this->buildCell($value, $index);
+            $row[] = $this->buildCell((string)$value, $index);
         }
         $row = $this->pad(implode($this->characters['border'], $row), $this->characters['border']);
 
diff --git a/src/Titon/Console/Tree.hh b/src/Titon/Console/Tree.hh
index 695447a..ee23b3e 100644
--- a/src/Titon/Console/Tree.hh
+++ b/src/Titon/Console/Tree.hh
@@ -19,7 +19,7 @@ interface Tree {
      *
      * @return array<mixed>
      */
-    public function getData(): array<mixed>;
+    public function getData(): Vector<mixed>;
 
     /**
      * Build and return the markup for the `Tree`.
@@ -35,5 +35,5 @@ interface Tree {
      *
      * @return $this
      */
-    public function setData(array<mixed> $data): this;
+    public function setData(Vector<mixed> $data): this;
 }
\ No newline at end of file
diff --git a/src/Titon/Console/Tree/AbstractTree.hh b/src/Titon/Console/Tree/AbstractTree.hh
index cff3cf4..d885c7f 100644
--- a/src/Titon/Console/Tree/AbstractTree.hh
+++ b/src/Titon/Console/Tree/AbstractTree.hh
@@ -22,14 +22,14 @@ abstract class AbstractTree implements Tree {
      *
      * @var array<mixed>
      */
-    protected array<mixed> $data = [];
+    protected Vector<mixed> $data = Vector {};
 
     /**
      * Construct a new instance of a tree.
      *
      * @param array<mixed> $data    The data to render
      */
-    public function __construct(array<mixed> $data = []) {
+    public function __construct(Vector<mixed> $data = Vector {}) {
         $this->data = $data;
     }
 
@@ -42,14 +42,14 @@ abstract class AbstractTree implements Tree {
      *
      * @retun string
      */
-    abstract protected function build(array<mixed> $tree, string $prefix = ''): string;
+    abstract protected function build(Vector<mixed> $tree, string $prefix = ''): string;
 
     /**
      * Retrieve the data of the tree.
      *
      * @return array<mixed>
      */
-    public function getData(): array<mixed> {
+    public function getData(): Vector<mixed> {
         return $this->data;
     }
 
@@ -65,7 +65,7 @@ abstract class AbstractTree implements Tree {
     /**
      * {@inheritdoc}
      */
-    public function setData(array<mixed> $data): this {
+    public function setData(Vector<mixed> $data): this {
         $this->data = $data;
 
         return $this;
diff --git a/src/Titon/Console/Tree/AsciiTree.hh b/src/Titon/Console/Tree/AsciiTree.hh
index 6e31ff3..b42545a 100644
--- a/src/Titon/Console/Tree/AsciiTree.hh
+++ b/src/Titon/Console/Tree/AsciiTree.hh
@@ -17,7 +17,7 @@ class AsciiTree extends AbstractTree {
     /**
      * {@inheritdoc}
      */
-    protected function build(array<string> $tree, string $prefix = ''): string {
+    protected function build(Vector<mixed> $tree, string $prefix = ''): string {
         if (is_null($tree)) {
             $tree = $this->data;
         }
@@ -28,12 +28,12 @@ class AsciiTree extends AbstractTree {
         $branch = array_values($tree);
         for ($i = 0, $count = count($branch); $i < $count; ++$i) {
             if (is_array($branch[$i])) {
-                $retval[] = $prefix . '+-' . $keys[$i];
+                $retval[] = $prefix . '+-' . (string)$keys[$i];
             } else {
-                $retval[] = $prefix . '+-' . $branch[$i];
+                $retval[] = $prefix . '+-' . (string)$branch[$i];
             }
 
-            if (is_array($branch[$i])) {
+            if ($branch[$i] instanceof Vector) {
                 $retval[] = $this->build($branch[$i], $prefix . ($i == $count - 1 ? '  ' : '| '));
             }
         }
diff --git a/src/Titon/Console/Tree/MarkdownTree.hh b/src/Titon/Console/Tree/MarkdownTree.hh
index 0b9c7eb..596dfc2 100644
--- a/src/Titon/Console/Tree/MarkdownTree.hh
+++ b/src/Titon/Console/Tree/MarkdownTree.hh
@@ -17,7 +17,7 @@ class MarkdownTree extends AbstractTree {
     /**
      * {@inheritdoc}
      */
-    protected function build(array<string> $tree, string $prefix = ''): string {
+    protected function build(Vector<mixed> $tree, string $prefix = ''): string {
         if (is_null($tree)) {
             $tree = $this->data;
         }
@@ -31,7 +31,7 @@ class MarkdownTree extends AbstractTree {
 
             $retval[] = "$prefix- $label";
 
-            if (is_array($branch)) {
+            if ($branch instanceof Vector) {
                 $retval[] = $this->build($branch, "$prefix  ");
             }
         }

From 6ce69d2e5aa3f749eed39b57ff0e9986148315bd Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Fri, 6 Mar 2015 19:08:43 -0500
Subject: [PATCH 27/92] initial commit (output-related files)

---
 src/Titon/Console/Output.hh                |  79 ++++++++++++++
 src/Titon/Console/StyleDefinition.hh       | 115 +++++++++++++++++++++
 src/Titon/Console/System.hh                |  19 ++++
 src/Titon/Console/System/AbstractSystem.hh |  38 +++++++
 src/Titon/Console/System/Linux.hh          |  23 +++++
 src/Titon/Console/System/SystemFactory.hh  |  19 ++++
 src/Titon/Console/System/Windows.hh        |  40 +++++++
 src/Titon/Console/XmlParser.hh             |  24 +++++
 8 files changed, 357 insertions(+)
 create mode 100644 src/Titon/Console/Output.hh
 create mode 100644 src/Titon/Console/StyleDefinition.hh
 create mode 100644 src/Titon/Console/System.hh
 create mode 100644 src/Titon/Console/System/AbstractSystem.hh
 create mode 100644 src/Titon/Console/System/Linux.hh
 create mode 100644 src/Titon/Console/System/SystemFactory.hh
 create mode 100644 src/Titon/Console/System/Windows.hh
 create mode 100644 src/Titon/Console/XmlParser.hh

diff --git a/src/Titon/Console/Output.hh b/src/Titon/Console/Output.hh
new file mode 100644
index 0000000..be18455
--- /dev/null
+++ b/src/Titon/Console/Output.hh
@@ -0,0 +1,79 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console;
+
+class Output {
+
+    const VERBOSITY_QUIET = 0;
+    const VERBOSITY_NORMAL = 1;
+    const VERBOSITY_VERBOSE = 3;
+    const STREAM_STDOUT = 'php://stdout';
+    const STREAM_STDERR = 'php://stderr';
+    const ANSI_CLEAR_LINE = "\033[K";
+
+    protected resource $stderr;
+
+    protected resource $stdout;
+
+    protected Map<sting, StyleFormatter> $styles = Map {};
+
+    protected int $systemVerbosity;
+
+    public function __construct(int $verbosity = self::VERBOSITY_NORMAL) {
+        $this->stderr = fopen(Output::STREAM_STDERR, 'w');
+        $this->stdout = fopen(Output::STREAM_STDOUT, 'w');
+        $this->systemVerbosity = $verbosity;
+    }
+
+    public function error(string $output, int $verbosity = Output::VERBOSITY_NORMAL, int $newLines = 1): void {
+        if (!$this->shouldOutput($verbosity)) {
+            return;
+        }
+
+        $output = $this->format($output);
+        $output .= str_repeat("\n", $newLines);
+
+        fwrite($this->stderr, $output);
+    }
+
+    public function out(string $output, int $verbosity = Output::VERBOSITY_NORMAL, int $newLines = 1): void {
+        if (!$this->shouldOutput($verbosity)) {
+            return;
+        }
+
+        $output = $this->format($output);
+        $output .= str_repeat("\n", $newLines);
+
+        fwrite($this->stdout, $output);
+    }
+
+    public function format(string $message): string {
+        $parsedTags = array_unique(XmlParser::parseTags($message));
+        $formatMessage = $message;
+        foreach ($parsedTags as $xmlTag) {
+            if (!empty($this->styles[$xmlTag])) {
+                $formatter = $this->styles[$xmlTag];
+                $formatMessage = $formatter->format($xmlTag, $formatMessage);
+            }
+        }
+
+        return $formatMessage;
+    }
+
+    public function setFormat(string $element, StyleDefinition $format): this {
+        $this->styles[$element] = $format;
+    }
+
+    protected function shouldOutput(int $verbosity): bool {
+        if ($verbosity <= $this->systemVerbosity) {
+            return true;
+        }
+
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/Titon/Console/StyleDefinition.hh b/src/Titon/Console/StyleDefinition.hh
new file mode 100644
index 0000000..ccd8996
--- /dev/null
+++ b/src/Titon/Console/StyleDefinition.hh
@@ -0,0 +1,115 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console;
+
+class StyleDefinition {
+
+    private string $bgColor;
+
+    protected Map<string, int> $bgColorsMap = Map {
+        'black'   => 40,
+        'red'     => 41,
+        'green'   => 42,
+        'brown'   => 43,
+        'blue'    => 44,
+        'magenta' => 45,
+        'cyan'    => 46,
+        'white'   => 47,
+    };
+
+    private string $fgColor;
+
+    protected Map<string, string> $fgColorsMap = Map {
+        'black'        => '0;30',
+        'dark_gray'    => '1;30',
+        'blue'         => '0;34',
+        'light_blue'   => '1;34',
+        'green'        => '0;32',
+        'light_green'  => '1;32',
+        'cyan'         => '0;36',
+        'light_cyan'   => '1;36',
+        'red'          => '0;31',
+        'light_red'    => '1;31',
+        'purple'       => '0;35',
+        'light_purple' => '1;35',
+        'brown'        => '0;33',
+        'yellow'       => '1;33',
+        'light_gray'   => '0;37',
+        'white'        => '1;37',
+    };
+
+    private Vector<string> $effectsList;
+
+    protected Map<string, int> $effectsMap = Map {
+        'defaults'  => 0,
+        'bold'      => 1,
+        'underline' => 4,
+        'blink'     => 5,
+        'reverse'   => 7,
+        'conceal'   => 8,
+    };
+
+    public function __construct($fgColor, $bgColor = '', Vector<string> $effects = Vector {}) {
+        $this->fgColor = $fgColor;
+        $this->bgColor = $bgColor;
+        $this->effectsList = $effects;
+    }
+
+    public function format(string $xmlTag, string $value): string {
+        $values = XmlParser::getValueBetweenTags($xmlTag, $value);
+        $retval = $value;
+        foreach ($values as $val) {
+            $valueReplaced = '<' . $xmlTag . '>' . $val . '</' . $xmlTag . '>';
+            $valueResult = $this->replaceTagColors($val);
+
+            $retval = str_replace($valueReplaced, $valueResult, $retval);
+        }
+
+        return $retval;
+    }
+
+    private function replaceTagColors(string $text): string {
+        $colors = $this->getBgColorCode() . ';' . $this->getFgColorCode();
+        $effects = $this->getParsedStringEffects();
+        $effectsCodeString = $effects ? ';' . $effects : '';
+
+        return sprintf("\033[%sm%s\033[0m", $colors . $effectsCodeString, $text);
+    }
+
+    public function getBgColorCode(): string {
+        if ($bgColor = $this->bgColorsMap->get($this->bgColor)) {
+            return $bgColor;
+        }
+
+        return '';
+    }
+
+    public function getFgColorCode(): string {
+        if ($fgColor = $this->fgColorsMap->get($this->fgColor)) {
+            return $fgColor;
+        }
+
+        return '';
+    }
+
+    public function getParsedStringEffects(): string {
+        $effects = Vector {};
+
+        if (!empty($this->effectsList->isEmpty())) {
+            foreach ($this->effectsList as $effect) {
+                $effects[] = $this->getEffectCode($effect);
+            }
+        }
+
+        return implode(';', $effects);
+    }
+
+    public function getEffectCode(string $effect): int {
+        return $this->effectsMap[$effect];
+    }
+}
\ No newline at end of file
diff --git a/src/Titon/Console/System.hh b/src/Titon/Console/System.hh
new file mode 100644
index 0000000..d4ddbe0
--- /dev/null
+++ b/src/Titon/Console/System.hh
@@ -0,0 +1,19 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console;
+
+interface System {
+
+    public function getHeight(): int;
+
+    public function getWidth(): int;
+
+    public function isPiped(): bool;
+
+    public function supportsAnsi(): bool;
+}
\ No newline at end of file
diff --git a/src/Titon/Console/System/AbstractSystem.hh b/src/Titon/Console/System/AbstractSystem.hh
new file mode 100644
index 0000000..a49743c
--- /dev/null
+++ b/src/Titon/Console/System/AbstractSystem.hh
@@ -0,0 +1,38 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\System;
+
+use Titon\Console\System;
+
+abstract class AbstractSystem implements System {
+
+    protected bool $forceAnsi = false;
+
+    public function forceAnsiSupport(bool $force): this {
+        $this->forceAnsi = $force;
+
+        return $this;
+    }
+
+    public function hasAnsiSupport(): bool {
+        if ($this->forceAnsi === true) {
+            return true;
+        }
+
+        return $this->supportsAnsi();
+    }
+
+    public function isPiped(): bool {
+        $shellPipe = getenv('SHELL_PIPE');
+        if ($shellPipe !== false) {
+            return filter_var($shellPipe, FILTER_VALIDATE_BOOLEAN);
+        } else {
+            return function_exists('posix_isatty') && !@posix_isatty(STDOUT);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Titon/Console/System/Linux.hh b/src/Titon/Console/System/Linux.hh
new file mode 100644
index 0000000..bc5a9a2
--- /dev/null
+++ b/src/Titon/Console/System/Linux.hh
@@ -0,0 +1,23 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\System;
+
+class Linux extends AbstractSystem {
+
+    public function getHeight(): int {
+        return (int)exec('tput lines');
+    }
+
+    public function getWidth(): int {
+        return (int)exec('tput cols');
+    }
+
+    public function supportsAnsi(): bool {
+        return (function_exists('posix_isatty') && @posix_isatty(STDOUT));
+    }
+}
\ No newline at end of file
diff --git a/src/Titon/Console/System/SystemFactory.hh b/src/Titon/Console/System/SystemFactory.hh
new file mode 100644
index 0000000..1aa85a8
--- /dev/null
+++ b/src/Titon/Console/System/SystemFactory.hh
@@ -0,0 +1,19 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\System;
+
+class SystemFactory {
+
+    public static function factory() {
+        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+            return new Windows();
+        }
+
+        return new Linux();
+    }
+}
\ No newline at end of file
diff --git a/src/Titon/Console/System/Windows.hh b/src/Titon/Console/System/Windows.hh
new file mode 100644
index 0000000..a046a57
--- /dev/null
+++ b/src/Titon/Console/System/Windows.hh
@@ -0,0 +1,40 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\System;
+
+class Windows extends AbstractSystem {
+
+    protected Map<string, string> $modeOutput = Map {};
+
+    public function getHeight(): int {
+        $this->getStats();
+
+        return $this->modeOutput[0];
+    }
+
+    public function getWidth(): int {
+        $this->getStats();
+
+        return $this->modeOutput[1];
+    }
+
+    public function getStats(): Map<string, string> {
+        if ($this->modeOutput->isEmpty()) {
+            exec('mode', $output);
+            $output = implode("\n", $output);
+            preg_match_all('/.*:\s*(\d+)/', $output, $matches);
+            $this->modeOutput = (!empty($matches[1])) ? $matches[1] : [];
+        }
+
+        return $this->modeOutput;
+    }
+
+    public function supportsAnsi(): bool {
+        return (getenv('ANSICON') === true || getenv('ConEmuANSI') === 'ON');
+    }
+}
\ No newline at end of file
diff --git a/src/Titon/Console/XmlParser.hh b/src/Titon/Console/XmlParser.hh
new file mode 100644
index 0000000..bc179d2
--- /dev/null
+++ b/src/Titon/Console/XmlParser.hh
@@ -0,0 +1,24 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console;
+
+class XmlParser {
+
+    public static function parseTags(string $stringToParse): array<string> {
+        preg_match_all('#<([\w-]*?)>#', $stringToParse, $tagsMatched);
+
+        return $tagsMatched[1];
+    }
+
+    public function getValueBetweenTags(string $tag, string $stringToParse): array<string> {
+        $regexp = '#<' . $tag . '>(.*?)</' . $tag . '>#s';
+        preg_match_all($regexp, $stringToParse, $valuesMatched);
+
+        return $valuesMatched[1];
+    }
+}
\ No newline at end of file

From c2b21e399c2a6c91c1a06061794d46c3bda0f22d Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Fri, 6 Mar 2015 19:42:04 -0500
Subject: [PATCH 28/92] we now recursively format the string to handle nested
 xml styles

---
 src/Titon/Console/Output.hh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Titon/Console/Output.hh b/src/Titon/Console/Output.hh
index be18455..8f060fe 100644
--- a/src/Titon/Console/Output.hh
+++ b/src/Titon/Console/Output.hh
@@ -59,6 +59,9 @@ class Output {
             if (!empty($this->styles[$xmlTag])) {
                 $formatter = $this->styles[$xmlTag];
                 $formatMessage = $formatter->format($xmlTag, $formatMessage);
+                $formatMessage = preg_replace_callback('#<[\w-]+?>.*<\/[\w-]+?>#', function($matches) use ($formatter) {
+                    return $formatter->getEndCode() . $this->format($matches[0]) . $formatter->getStartCode();
+                }, $formatMessage);
             }
         }
 

From f8985b042d99d95ea57da2198be9e9a304bb6074 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Sat, 7 Mar 2015 12:43:16 -0500
Subject: [PATCH 29/92] initial feedback commit

---
 src/Titon/Console/Feedback.hh                 |  23 +++
 .../Console/Feedback/AbstractFeedback.hh      | 192 ++++++++++++++++++
 src/Titon/Console/Feedback/ProgressBar.hh     |  48 +++++
 src/Titon/Console/Feedback/Wait.hh            |  73 +++++++
 4 files changed, 336 insertions(+)
 create mode 100644 src/Titon/Console/Feedback.hh
 create mode 100644 src/Titon/Console/Feedback/AbstractFeedback.hh
 create mode 100644 src/Titon/Console/Feedback/ProgressBar.hh
 create mode 100644 src/Titon/Console/Feedback/Wait.hh

diff --git a/src/Titon/Console/Feedback.hh b/src/Titon/Console/Feedback.hh
new file mode 100644
index 0000000..9ec4b23
--- /dev/null
+++ b/src/Titon/Console/Feedback.hh
@@ -0,0 +1,23 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console;
+
+interface Feedback {
+
+    public function advance(): void;
+
+    public function finish(): void;
+
+    public function setMessage(string $message): this;
+
+    public function setPrefix(string $prefix): this;
+
+    public function setSuffix(string $suffix): this;
+
+    public function setTotal(int $total): this;
+}
\ No newline at end of file
diff --git a/src/Titon/Console/Feedback/AbstractFeedback.hh b/src/Titon/Console/Feedback/AbstractFeedback.hh
new file mode 100644
index 0000000..de23f62
--- /dev/null
+++ b/src/Titon/Console/Feedback/AbstractFeedback.hh
@@ -0,0 +1,192 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\Feedback;
+
+use Titon\Console\Feedback;
+use Titon\Console\Output;
+
+abstract class AbstractFeedback implements Feedback {
+
+    protected int $current = 0;
+
+    protected string $format = '{:prefix}{:feedback}{:suffix}';
+
+    protected int $interval;
+
+    protected string $message;
+
+    protected Output $output;
+
+    protected string $prefix = '{:message}  {:percent}% [';
+
+    protected ?int $start;
+
+    protected string $suffix = '] {:elapsed} / {:estimated}';
+
+    protected ?int $timer;
+
+    protected int $total = 0;
+
+    public function __construct(int $total = 0, string $message = '', int $interval = 100) {
+        $this->output = new Output();
+        $this->message = $message;
+        $this->interval = $interval;
+        $this->setTotal($total);
+    }
+
+    public function advance(int $increment = 1): void {
+        $this->current = min($this->total, $this->current + $increment);
+
+        if ($this->shouldUpdate()) {
+            $this->display();
+        }
+    }
+
+    protected function buildOutputVariables(): Map<string, mixed> {
+        $message = $this->message;
+        $percent = str_pad(floor($this->getPercentageComplete() * 100), 3);;
+        $estimated = $this->formatTime((int)$this->estimateTimeRemaining());
+        $elapsed = str_pad(
+            $this->formatTime($this->getElapsedTime()), strlen($estimated)
+        );
+
+        $variables = Map {
+            'message'   => $message,
+            'percent'   => $percent,
+            'elapsed'   => $elapsed,
+            'estimated' => $estimated,
+        };
+
+        return $variables;
+    }
+
+    protected function current(): int {
+        $size = strlen($this->getTotal());
+
+        return str_pad(number_format($this->current), $size);
+    }
+
+    abstract protected function display(bool $finish = false): void;
+
+    protected function estimateTimeRemaining(): float {
+        $speed = $this->getSpeed();
+        if (is_null($speed) || !$this->getElapsedTime()) {
+            return 0.0;
+        }
+
+        return round($this->total / $speed);
+    }
+
+    public function finish(): void {
+        $this->current = $this->total;
+        $this->display(true);
+        $this->output->out();
+    }
+
+    protected function format(string $message, Map<string, mixed> $args = Map {}): string {
+        if ($args->isEmpty()) {
+            return $message;
+        }
+
+        foreach ($args as $key => $value) {
+            $message = str_replace('{:' . $key . '}', $value, $message);
+        }
+
+        return $message;
+    }
+
+    protected function formatTime(int $time): string {
+        return floor($time / 60) . ':' . str_pad(
+            $time % 60, 2, 0, STR_PAD_LEFT
+        );
+    }
+
+    protected function getElapsedTime(): int {
+        if (is_null($this->start)) {
+            return 0;
+        }
+
+        return (time() - $this->start);
+    }
+
+    protected function getPercentageComplete(): float {
+        if ($this->total == 0) {
+            return 1.0;
+        }
+
+        return (float)($this->current / $this->total);
+    }
+
+    protected function getSpeed(): float {
+        static $tick, $iteration = 0, $speed = 0;
+
+        if (is_null($this->start)) {
+            return 0.0;
+        }
+
+        if (is_null($tick)) {
+            $tick = $this->start;
+        }
+
+        $now = microtime(true);
+        $span = $now - $tick;
+        if ($span > 1) {
+            $iteration++;
+            $tick = $now;
+            $speed = ($this->current / $iteration) / $span;
+        }
+
+        return (float)$speed;
+    }
+
+    protected function getTotal(): mixed {
+        return number_format($this->total);
+    }
+
+    public function setMessage(string $message): this {
+        $this->message = $message;
+
+        return $this;
+    }
+
+    public function setPrefix(string $prefix): this {
+        $this->prefix = $prefix;
+
+        return $this;
+    }
+
+    public function setSuffix(string $sufix): this {
+        $this->suffix = $sufix;
+
+        return $this;
+    }
+
+    public function setTotal(int $total): this {
+        $this->total = (int)$total;
+
+        return $this;
+    }
+
+    protected function shouldUpdate(): bool {
+        $now = microtime(true) * 1000;
+
+        if (is_null($this->timer)) {
+            $this->start = (int)(($this->timer = $now) / 1000);
+
+            return true;
+        }
+
+        if (($now - $this->timer) > $this->interval) {
+            $this->timer = $now;
+
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/src/Titon/Console/Feedback/ProgressBar.hh b/src/Titon/Console/Feedback/ProgressBar.hh
new file mode 100644
index 0000000..eb5cdd9
--- /dev/null
+++ b/src/Titon/Console/Feedback/ProgressBar.hh
@@ -0,0 +1,48 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\Feedback;
+
+use Titon\Console\Output;
+use Titon\Console\System\SystemFactory;
+
+class ProgressBar extends AbstractFeedback {
+
+    protected string $bar = '=>';
+
+    protected string $prefix = '{:message}  {:percent}% [';
+
+    protected string $suffix = '] {:elapsed} / {:estimated}';
+
+    protected function display(bool $finish = false): void {
+        $completed = $this->getPercentageComplete();
+        $variables = $this->buildOutputVariables();
+
+        // Need to make prefix and suffix before the bar so we know how long
+        // to render it.
+        $prefix = $this->format($this->prefix, $variables);
+        $suffix = $this->format($this->suffix, $variables);
+
+        $size = SystemFactory::factory()->getWidth();
+        $size -= strlen($prefix . $suffix);
+        if ($size < 0) {
+            $size = 0;
+        }
+
+        // substr is needed to trim off the bar cap at 100%
+        $bar = str_repeat($this->bar[0], floor($completed * $size)) . $this->bar[1];
+        $bar = substr(str_pad($bar, $size, ' '), 0, $size);
+
+        $variables = Map {
+            'prefix'   => $prefix,
+            'feedback' => $bar,
+            'suffix'   => $suffix
+        };
+
+        $this->output->out($this->format($this->format, $variables), Output::VERBOSITY_NORMAL, 1, Output::CR);
+    }
+}
\ No newline at end of file
diff --git a/src/Titon/Console/Feedback/Wait.hh b/src/Titon/Console/Feedback/Wait.hh
new file mode 100644
index 0000000..491ca32
--- /dev/null
+++ b/src/Titon/Console/Feedback/Wait.hh
@@ -0,0 +1,73 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\Feedback;
+
+use Titon\Console\Output;
+use Titon\Console\System\SystemFactory;
+
+class Wait extends AbstractFeedback {
+
+    protected Vector<string> $characterSequence = Vector {
+        '-',
+        '\\',
+        '|',
+        '/'
+    };
+
+    protected int $iteration = 0;
+
+    protected int $maxLength = 1;
+
+    protected string $prefix = " {:message}";
+
+    protected string $suffix = "";
+
+    public function __construct(int $total = 0, string $message = '', int $interval = 100) {
+        parent::__construct($total, $message, $interval);
+    }
+
+    public function display(bool $finish = false): void {
+        $variables = $this->buildOutputVariables();
+
+        $index = $this->iteration++ % $this->characterSequence->count();
+        $feedback = str_pad($this->characterSequence[$index], $this->maxLength + 1);
+
+        $prefix = $this->format($this->prefix, $variables);
+        $suffix = $this->format($this->suffix, $variables);
+
+        $variables = Map {
+            'prefix'   => $prefix,
+            'feedback' => $feedback,
+            'suffix'   => $suffix
+        };
+
+        $this->output->out(
+            str_pad($this->format(
+                $this->format, $variables
+            ), SystemFactory::factory()->getWidth()),
+            1,
+            Output::VERBOSITY_NORMAL,
+            Output::CR
+        );
+    }
+
+    public function setCharacterSequence(Vector<string> $characters): this {
+        $this->characterSequence = $characters;
+        $this->setMaxLength();
+
+        return $this;
+    }
+
+    protected function setMaxLength(): this {
+        $this->maxLength = max(array_map(($key) ==> {
+            return strlen($key);
+        }, $this->characterSequence));
+
+        return $this;
+    }
+}
\ No newline at end of file

From b03f79b0cb0db14aaf30c733d216dabec519b32e Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Sat, 7 Mar 2015 12:43:48 -0500
Subject: [PATCH 30/92] type checker fixes

---
 src/Titon/Console/InputDefinition/Flag.hh |  2 +-
 src/Titon/Console/Output.hh               | 66 ++++++++++++++---------
 src/Titon/Console/StyleDefinition.hh      | 50 +++++++++++------
 src/Titon/Console/System/Windows.hh       | 12 +++--
 src/Titon/Console/Table/AbstractTable.hh  |  8 +--
 src/Titon/Console/Table/AsciiTable.hh     | 12 ++---
 src/Titon/Console/Tree/AsciiTree.hh       |  5 +-
 src/Titon/Console/XmlParser.hh            | 24 ---------
 8 files changed, 98 insertions(+), 81 deletions(-)
 delete mode 100644 src/Titon/Console/XmlParser.hh

diff --git a/src/Titon/Console/InputDefinition/Flag.hh b/src/Titon/Console/InputDefinition/Flag.hh
index b3f6384..2936e72 100644
--- a/src/Titon/Console/InputDefinition/Flag.hh
+++ b/src/Titon/Console/InputDefinition/Flag.hh
@@ -18,7 +18,7 @@ class Flag extends AbstractInputDefinition {
      * The negative alias of the `Flag` (i.e., --no-foo for -foo). A negative
      * value is only available if a 'long' `Flag` name is available.
      *
-     * @var ?string
+     * @var string|null
      */
     protected ?string $negativeAlias;
 
diff --git a/src/Titon/Console/Output.hh b/src/Titon/Console/Output.hh
index 8f060fe..c9c5db4 100644
--- a/src/Titon/Console/Output.hh
+++ b/src/Titon/Console/Output.hh
@@ -9,18 +9,20 @@ namespace Titon\Console;
 
 class Output {
 
-    const VERBOSITY_QUIET = 0;
-    const VERBOSITY_NORMAL = 1;
-    const VERBOSITY_VERBOSE = 3;
-    const STREAM_STDOUT = 'php://stdout';
-    const STREAM_STDERR = 'php://stderr';
-    const ANSI_CLEAR_LINE = "\033[K";
+    const int VERBOSITY_QUIET = 0;
+    const int VERBOSITY_NORMAL = 1;
+    const int VERBOSITY_VERBOSE = 3;
+    const string STREAM_STDOUT = 'php://stdout';
+    const string STREAM_STDERR = 'php://stderr';
+    const string ANSI_CLEAR_LINE = "\033[K";
+    const string LF = PHP_EOL;
+    const string CR = "\r";
 
     protected resource $stderr;
 
     protected resource $stdout;
 
-    protected Map<sting, StyleFormatter> $styles = Map {};
+    protected Map<string, StyleDefinition> $styles = Map {};
 
     protected int $systemVerbosity;
 
@@ -30,7 +32,7 @@ class Output {
         $this->systemVerbosity = $verbosity;
     }
 
-    public function error(string $output, int $verbosity = Output::VERBOSITY_NORMAL, int $newLines = 1): void {
+    public function error(string $output = '', int $verbosity = Output::VERBOSITY_NORMAL, int $newLines = 1): void {
         if (!$this->shouldOutput($verbosity)) {
             return;
         }
@@ -38,38 +40,52 @@ class Output {
         $output = $this->format($output);
         $output .= str_repeat("\n", $newLines);
 
-        fwrite($this->stderr, $output);
+        $this->send($output, $this->stderr);
     }
 
-    public function out(string $output, int $verbosity = Output::VERBOSITY_NORMAL, int $newLines = 1): void {
+    public function format(string $message): string {
+        $parsedTags = array_unique($this->parseTags($message));
+        $retval = $message;
+        foreach ($parsedTags as $xmlTag) {
+            if (!is_null($this->styles[$xmlTag])) {
+                $style = $this->styles[$xmlTag];
+                $retval = $style->format($xmlTag, $retval);
+                $matches = [];
+                $retval = preg_replace_callback('#<[\w-]+?>.*<\/[\w-]+?>#', ($matches) ==> {
+                    return sprintf("%s%s%s", $style->getEndCode(), $this->format($matches[0]), $style->getStartCode());
+                }, $retval);
+            }
+        }
+
+        return $retval;
+    }
+
+    public function out(string $output = '', int $verbosity = Output::VERBOSITY_NORMAL, int $newLines = 1, string $newlineChar = Output::LF): void {
         if (!$this->shouldOutput($verbosity)) {
             return;
         }
 
         $output = $this->format($output);
-        $output .= str_repeat("\n", $newLines);
+        $output .= str_repeat($newlineChar, $newLines);
 
-        fwrite($this->stdout, $output);
+        $this->send($output, $this->stdout);
     }
 
-    public function format(string $message): string {
-        $parsedTags = array_unique(XmlParser::parseTags($message));
-        $formatMessage = $message;
-        foreach ($parsedTags as $xmlTag) {
-            if (!empty($this->styles[$xmlTag])) {
-                $formatter = $this->styles[$xmlTag];
-                $formatMessage = $formatter->format($xmlTag, $formatMessage);
-                $formatMessage = preg_replace_callback('#<[\w-]+?>.*<\/[\w-]+?>#', function($matches) use ($formatter) {
-                    return $formatter->getEndCode() . $this->format($matches[0]) . $formatter->getStartCode();
-                }, $formatMessage);
-            }
-        }
+    protected function parseTags(string $stringToParse): array<string> {
+        $tagsMatched = [];
+        preg_match_all('#<([\w-]*?)>#', $stringToParse, $tagsMatched);
 
-        return $formatMessage;
+        return $tagsMatched[1];
     }
 
     public function setFormat(string $element, StyleDefinition $format): this {
         $this->styles[$element] = $format;
+
+        return $this;
+    }
+
+    protected function send(string $response, resource $stream): void {
+        fwrite($stream, $response);
     }
 
     protected function shouldOutput(int $verbosity): bool {
diff --git a/src/Titon/Console/StyleDefinition.hh b/src/Titon/Console/StyleDefinition.hh
index ccd8996..34d4dc3 100644
--- a/src/Titon/Console/StyleDefinition.hh
+++ b/src/Titon/Console/StyleDefinition.hh
@@ -54,14 +54,14 @@ class StyleDefinition {
         'conceal'   => 8,
     };
 
-    public function __construct($fgColor, $bgColor = '', Vector<string> $effects = Vector {}) {
+    public function __construct(string $fgColor, string $bgColor = '', Vector<string> $effects = Vector {}) {
         $this->fgColor = $fgColor;
         $this->bgColor = $bgColor;
         $this->effectsList = $effects;
     }
 
     public function format(string $xmlTag, string $value): string {
-        $values = XmlParser::getValueBetweenTags($xmlTag, $value);
+        $values = $this->getValueBetweenTags($xmlTag, $value);
         $retval = $value;
         foreach ($values as $val) {
             $valueReplaced = '<' . $xmlTag . '>' . $val . '</' . $xmlTag . '>';
@@ -73,24 +73,28 @@ class StyleDefinition {
         return $retval;
     }
 
-    private function replaceTagColors(string $text): string {
-        $colors = $this->getBgColorCode() . ';' . $this->getFgColorCode();
-        $effects = $this->getParsedStringEffects();
-        $effectsCodeString = $effects ? ';' . $effects : '';
-
-        return sprintf("\033[%sm%s\033[0m", $colors . $effectsCodeString, $text);
-    }
-
     public function getBgColorCode(): string {
-        if ($bgColor = $this->bgColorsMap->get($this->bgColor)) {
+        if (!is_null($bgColor = $this->bgColorsMap->get($this->bgColor))) {
+            invariant(is_string($bgColor), "Must be a string.");
+
             return $bgColor;
         }
 
         return '';
     }
 
+    public function getEffectCode(string $effect): int {
+        return $this->effectsMap[$effect];
+    }
+
+    public function getEndCode(): string {
+        return "\033[0m";
+    }
+
     public function getFgColorCode(): string {
-        if ($fgColor = $this->fgColorsMap->get($this->fgColor)) {
+        if (!is_null($fgColor = $this->fgColorsMap->get($this->fgColor))) {
+            invariant(is_string($fgColor), "Must be a string.");
+
             return $fgColor;
         }
 
@@ -100,7 +104,7 @@ class StyleDefinition {
     public function getParsedStringEffects(): string {
         $effects = Vector {};
 
-        if (!empty($this->effectsList->isEmpty())) {
+        if ($this->effectsList->isEmpty()) {
             foreach ($this->effectsList as $effect) {
                 $effects[] = $this->getEffectCode($effect);
             }
@@ -109,7 +113,23 @@ class StyleDefinition {
         return implode(';', $effects);
     }
 
-    public function getEffectCode(string $effect): int {
-        return $this->effectsMap[$effect];
+    public function getStartCode(): string {
+        $colors = $this->getBgColorCode() . ';' . $this->getFgColorCode();
+        $effects = $this->getParsedStringEffects();
+        $effects = $effects ? ';' . $effects : '';
+
+        return sprintf("\033[%sm", $colors . $effects);
+    }
+
+    public function getValueBetweenTags(string $tag, string $stringToParse): array<string> {
+        $regexp = '#<' . $tag . '>(.*?)</' . $tag . '>#s';
+        $valuesMatched = [];
+        preg_match_all($regexp, $stringToParse, $valuesMatched);
+
+        return $valuesMatched[1];
+    }
+
+    protected function replaceTagColors(string $text): string {
+        return sprintf("%s%s%s", $this->getStartCode(), $text, $this->getEndCode());
     }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/System/Windows.hh b/src/Titon/Console/System/Windows.hh
index a046a57..b7967f0 100644
--- a/src/Titon/Console/System/Windows.hh
+++ b/src/Titon/Console/System/Windows.hh
@@ -9,26 +9,28 @@ namespace Titon\Console\System;
 
 class Windows extends AbstractSystem {
 
-    protected Map<string, string> $modeOutput = Map {};
+    protected Vector<string> $modeOutput = Vector {};
 
     public function getHeight(): int {
         $this->getStats();
 
-        return $this->modeOutput[0];
+        return (int)$this->modeOutput[0];
     }
 
     public function getWidth(): int {
         $this->getStats();
 
-        return $this->modeOutput[1];
+        return (int)$this->modeOutput[1];
     }
 
-    public function getStats(): Map<string, string> {
+    public function getStats(): Vector<string> {
         if ($this->modeOutput->isEmpty()) {
+            $output = '';
             exec('mode', $output);
             $output = implode("\n", $output);
+            $matches = [];
             preg_match_all('/.*:\s*(\d+)/', $output, $matches);
-            $this->modeOutput = (!empty($matches[1])) ? $matches[1] : [];
+            $this->modeOutput = new Vector((count($matches[1]) > 0) ? $matches[1] : []);
         }
 
         return $this->modeOutput;
diff --git a/src/Titon/Console/Table/AbstractTable.hh b/src/Titon/Console/Table/AbstractTable.hh
index a4ab6c1..a50b729 100644
--- a/src/Titon/Console/Table/AbstractTable.hh
+++ b/src/Titon/Console/Table/AbstractTable.hh
@@ -29,7 +29,7 @@ abstract class AbstractTable implements Table {
      *
      * @var Vector<string>
      */
-    protected Vector<string> $headers = Vector {};
+    protected Vector<mixed> $headers = Vector {};
 
     /**
      * Data structure holding the data for each row in the table.
@@ -63,7 +63,9 @@ abstract class AbstractTable implements Table {
     protected function setColumnWidths(Vector<mixed> $row): void {
         foreach ($row as $index => $value) {
             $width = strlen($value);
-            if (is_null($currentWidth = $this->columnWidths->get($index)) || $width > $currentWidth) {
+            $currentWidth = $this->columnWidths[$index] ?: 0;
+
+            if ($width > $currentWidth) {
                 if ($this->columnWidths->count() === $index) {
                     $this->columnWidths[] = $width;
                 } else {
@@ -108,7 +110,7 @@ abstract class AbstractTable implements Table {
      *
      * @return $this
      */
-    public function setHeaders(Vector<string> $headers): this {
+    public function setHeaders(Vector<mixed> $headers): this {
         $this->setColumnWidths($headers);
         $this->headers = $headers;
 
diff --git a/src/Titon/Console/Table/AsciiTable.hh b/src/Titon/Console/Table/AsciiTable.hh
index b90ea9c..6b6099e 100644
--- a/src/Titon/Console/Table/AsciiTable.hh
+++ b/src/Titon/Console/Table/AsciiTable.hh
@@ -28,19 +28,19 @@ class AsciiTable extends AbstractTable {
      * @var Map<string, string>
      */
     protected Map<string, string> $characters = Map {
-        'corner' => '+',
-        'line' => '-',
+        'corner'      => '+',
+        'line'        => '-',
         'header_line' => '=',
-        'border' => '|',
-        'padding' => ' ',
+        'border'      => '|',
+        'padding'     => ' ',
     };
 
     /**
      * The integer length of the width each row should be.
      *
-     * @var ?int
+     * @var int|null
      */
-    protected ?int $rowWidth;
+    protected int $rowWidth = 0;
 
     /**
      * Given a string value and a padding string, return the value with the pad
diff --git a/src/Titon/Console/Tree/AsciiTree.hh b/src/Titon/Console/Tree/AsciiTree.hh
index b42545a..96b8e3b 100644
--- a/src/Titon/Console/Tree/AsciiTree.hh
+++ b/src/Titon/Console/Tree/AsciiTree.hh
@@ -33,8 +33,9 @@ class AsciiTree extends AbstractTree {
                 $retval[] = $prefix . '+-' . (string)$branch[$i];
             }
 
-            if ($branch[$i] instanceof Vector) {
-                $retval[] = $this->build($branch[$i], $prefix . ($i == $count - 1 ? '  ' : '| '));
+            $next = $branch[$i];
+            if ($next instanceof Vector) {
+                $retval[] = $this->build($next, $prefix . ($i == $count - 1 ? '  ' : '| '));
             }
         }
 
diff --git a/src/Titon/Console/XmlParser.hh b/src/Titon/Console/XmlParser.hh
deleted file mode 100644
index bc179d2..0000000
--- a/src/Titon/Console/XmlParser.hh
+++ /dev/null
@@ -1,24 +0,0 @@
-<?hh // strict
-/**
- * @copyright   2010-2015, The Titon Project
- * @license     http://opensource.org/licenses/bsd-license.php
- * @link        http://titon.io
- */
-
-namespace Titon\Console;
-
-class XmlParser {
-
-    public static function parseTags(string $stringToParse): array<string> {
-        preg_match_all('#<([\w-]*?)>#', $stringToParse, $tagsMatched);
-
-        return $tagsMatched[1];
-    }
-
-    public function getValueBetweenTags(string $tag, string $stringToParse): array<string> {
-        $regexp = '#<' . $tag . '>(.*?)</' . $tag . '>#s';
-        preg_match_all($regexp, $stringToParse, $valuesMatched);
-
-        return $valuesMatched[1];
-    }
-}
\ No newline at end of file

From f49e02f727e404b90d45a2b5fa4e610b3553be9d Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Sat, 7 Mar 2015 21:30:41 -0500
Subject: [PATCH 31/92] initial commit for user input classes

---
 src/Titon/Console/Input.hh                    | 23 ++++++-
 src/Titon/Console/UserInput.hh                | 12 ++++
 .../Console/UserInput/AbstractUserInput.hh    | 28 ++++++++
 src/Titon/Console/UserInput/Confirm.hh        | 68 +++++++++++++++++++
 src/Titon/Console/UserInput/Menu.hh           | 15 ++++
 5 files changed, 144 insertions(+), 2 deletions(-)
 create mode 100644 src/Titon/Console/UserInput.hh
 create mode 100644 src/Titon/Console/UserInput/AbstractUserInput.hh
 create mode 100644 src/Titon/Console/UserInput/Confirm.hh
 create mode 100644 src/Titon/Console/UserInput/Menu.hh

diff --git a/src/Titon/Console/Input.hh b/src/Titon/Console/Input.hh
index 78df7f1..9705734 100644
--- a/src/Titon/Console/Input.hh
+++ b/src/Titon/Console/Input.hh
@@ -23,6 +23,8 @@ use Titon\Console\Exception\InvalidCommandException;
  */
 class Input {
 
+    const string STREAM_STDIN = 'php://stdin';
+
     /**
      * Bag container holding all registered `Argument` objects
      *
@@ -73,6 +75,13 @@ class Input {
      */
     protected InputBag<Option> $options;
 
+    /**
+     * Stream handle for user input.
+     *
+     * @var resource
+     */
+    protected resource $stdin;
+
     /**
      * The 'strict' value of the `Input` object. If set to `true`, then any invalid
      * parameters found in the input will throw an exception.
@@ -84,7 +93,7 @@ class Input {
     /**
      * Construct a new instance of Input
      *
-     * @param ?array<mixed> $args
+     * @param array<mixed>|null $args
      */
     public function __construct(?array<string> $args = null, bool $strict = false) {
         if (is_null($args)) {
@@ -96,6 +105,7 @@ class Input {
         $this->options = new InputBag();
         $this->arguments = new InputBag();
         $this->strict = $strict;
+        $this->stdin = fopen(Input::STREAM_STDIN, 'r');
     }
 
     /**
@@ -240,6 +250,15 @@ class Input {
         return $this->strict;
     }
 
+    /**
+     * Read in and return input from the user.
+     *
+     * @return string
+     */
+    public function getUserInput(): string {
+        return trim(fgets($this->stdin));
+    }
+
     /**
      * Parse input for all `Flag`, `Option`, and `Argument` candidates.
      *
@@ -394,4 +413,4 @@ class Input {
 
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Titon/Console/UserInput.hh b/src/Titon/Console/UserInput.hh
new file mode 100644
index 0000000..dc52a43
--- /dev/null
+++ b/src/Titon/Console/UserInput.hh
@@ -0,0 +1,12 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console;
+
+interface UserInput {
+
+}
\ No newline at end of file
diff --git a/src/Titon/Console/UserInput/AbstractUserInput.hh b/src/Titon/Console/UserInput/AbstractUserInput.hh
new file mode 100644
index 0000000..d802c5c
--- /dev/null
+++ b/src/Titon/Console/UserInput/AbstractUserInput.hh
@@ -0,0 +1,28 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\UserInput;
+
+use Titon\Console\Input;
+use Titon\Console\Output;
+use Titon\Console\UserInput;
+
+abstract class AbstractUserInput implements UserInput {
+
+    protected Vector<string> $acceptedValues = Vector {};
+
+    protected ?string $default;
+
+    protected Input $input;
+
+    protected Output $output;
+
+    public function __construct() {
+        $this->input = new Input();
+        $this->output = new Output();
+    }
+}
\ No newline at end of file
diff --git a/src/Titon/Console/UserInput/Confirm.hh b/src/Titon/Console/UserInput/Confirm.hh
new file mode 100644
index 0000000..d71a5c3
--- /dev/null
+++ b/src/Titon/Console/UserInput/Confirm.hh
@@ -0,0 +1,68 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\UserInput;
+
+use Titon\Console\Output;
+
+class Confirm extends AbstractUserInput {
+
+    public function __construct(string $message, ?string $default = null) {
+        parent::__construct();
+
+        $this->acceptedValues = Vector {
+            'y',
+            'yes',
+            'n',
+            'no'
+        };
+
+        switch (strtolower($default)) {
+            case 'y':
+            case 'yes':
+                $this->default = $default;
+                $message .= " [Y/n]";
+                break;
+            case 'n':
+            case 'no':
+                $this->default = $default;
+                $message .= " [y/N]";
+                break;
+            default:
+                $message .= " [y/n]";
+                break;
+        }
+
+        $this->message = $message;
+    }
+
+    public function confirmed(): bool {
+        $input = $this->prompt();
+
+        switch (strtolower($input)) {
+            case 'y':
+            case 'yes':
+                return true;
+            case 'n':
+            case 'no':
+            default:
+                return false;
+        }
+    }
+
+    public function prompt(): string {
+        do {
+            $this->output->out("$this->message ", Output::VERBOSITY_NORMAL, 0);
+            $input = $this->input->getUserInput();
+            if ($input === '' && !is_null($this->default)) {
+                $input = $this->default;
+            }
+        } while ($this->acceptedValues->linearSearch(strtolower($input)) < 0);
+
+        return $input;
+    }
+}
\ No newline at end of file
diff --git a/src/Titon/Console/UserInput/Menu.hh b/src/Titon/Console/UserInput/Menu.hh
new file mode 100644
index 0000000..590c4e6
--- /dev/null
+++ b/src/Titon/Console/UserInput/Menu.hh
@@ -0,0 +1,15 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\UserInput;
+
+class Menu extends AbstractUserInput {
+
+    public function __construct(string $message, Map<mixed, string> $choices) {
+
+    }
+}
\ No newline at end of file

From 4cc138eeee7f21589047c8f2094c5eeea86864c5 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Sun, 8 Mar 2015 10:02:09 -0400
Subject: [PATCH 32/92] added 'Prompt' class, adjusted abstract method to
 include more functionality

---
 src/Titon/Console/UserInput.hh                |  1 +
 .../Console/UserInput/AbstractUserInput.hh    | 14 ++++
 src/Titon/Console/UserInput/Confirm.hh        | 12 +--
 src/Titon/Console/UserInput/Menu.hh           | 41 ++++++++-
 src/Titon/Console/UserInput/Prompt.hh         | 84 +++++++++++++++++++
 5 files changed, 146 insertions(+), 6 deletions(-)
 create mode 100644 src/Titon/Console/UserInput/Prompt.hh

diff --git a/src/Titon/Console/UserInput.hh b/src/Titon/Console/UserInput.hh
index dc52a43..74b3344 100644
--- a/src/Titon/Console/UserInput.hh
+++ b/src/Titon/Console/UserInput.hh
@@ -9,4 +9,5 @@ namespace Titon\Console;
 
 interface UserInput {
 
+    public function prompt(string $message): string;
 }
\ No newline at end of file
diff --git a/src/Titon/Console/UserInput/AbstractUserInput.hh b/src/Titon/Console/UserInput/AbstractUserInput.hh
index d802c5c..e23942c 100644
--- a/src/Titon/Console/UserInput/AbstractUserInput.hh
+++ b/src/Titon/Console/UserInput/AbstractUserInput.hh
@@ -21,8 +21,22 @@ abstract class AbstractUserInput implements UserInput {
 
     protected Output $output;
 
+    protected bool $strict = true;
+
     public function __construct() {
         $this->input = new Input();
         $this->output = new Output();
     }
+
+    public function setDefault(string $default): this {
+        $this->default = $default;
+
+        return $this;
+    }
+
+    public function setStrict(bool $strict): this {
+        $this->strict = $strict;
+
+        return $this;
+    }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/UserInput/Confirm.hh b/src/Titon/Console/UserInput/Confirm.hh
index d71a5c3..d831379 100644
--- a/src/Titon/Console/UserInput/Confirm.hh
+++ b/src/Titon/Console/UserInput/Confirm.hh
@@ -11,7 +11,7 @@ use Titon\Console\Output;
 
 class Confirm extends AbstractUserInput {
 
-    public function __construct(string $message, ?string $default = null) {
+    public function __construct(?string $default = null) {
         parent::__construct();
 
         $this->acceptedValues = Vector {
@@ -25,15 +25,15 @@ class Confirm extends AbstractUserInput {
             case 'y':
             case 'yes':
                 $this->default = $default;
-                $message .= " [Y/n]";
+                $message = " [Y/n]";
                 break;
             case 'n':
             case 'no':
                 $this->default = $default;
-                $message .= " [y/N]";
+                $message = " [y/N]";
                 break;
             default:
-                $message .= " [y/n]";
+                $message = " [y/n]";
                 break;
         }
 
@@ -54,7 +54,9 @@ class Confirm extends AbstractUserInput {
         }
     }
 
-    public function prompt(): string {
+    public function prompt(string $message): string {
+        $this->message = "$message $this->message";
+
         do {
             $this->output->out("$this->message ", Output::VERBOSITY_NORMAL, 0);
             $input = $this->input->getUserInput();
diff --git a/src/Titon/Console/UserInput/Menu.hh b/src/Titon/Console/UserInput/Menu.hh
index 590c4e6..708e2f7 100644
--- a/src/Titon/Console/UserInput/Menu.hh
+++ b/src/Titon/Console/UserInput/Menu.hh
@@ -7,9 +7,48 @@
 
 namespace Titon\Console\UserInput;
 
+use Titon\Console\Output;
+
 class Menu extends AbstractUserInput {
 
-    public function __construct(string $message, Map<mixed, string> $choices) {
+    protected Map<mixed, mixed> $acceptedValues;
+
+    protected string $message;
+
+    public function __construct(Map<mixed, mixed> $choices, string $message = '') {
+        parent::__construct();
+
+        $this->acceptedValues = $choices;
+        $this->message = $message;
+    }
+
+    public function prompt(string $prompt): string {
+        $keys = $this->acceptedValues->keys();
+        $values = $this->acceptedValues->values();
+
+        if ($this->message !== '') {
+            $this->output->out($this->message);
+        }
+        foreach ($values as $index => $item) {
+            $this->output->out(sprintf('  %d. %s', $index + 1, (string)$item));
+        }
+
+        $this->output->out();
+
+        while (true) {
+            $this->output->out("$prompt: ", Output::VERBOSITY_NORMAL, 0);
+            $input = $this->input->getUserInput();
+
+            if (is_numeric($input)) {
+                $input--;
+                if (!is_null($values[$input])) {
+                    return $keys[$input];
+                }
 
+                if ($input < 0 || $input >= $values->count()) {
+                    $this->output->error('Invalid menu selection: out of range');
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/UserInput/Prompt.hh b/src/Titon/Console/UserInput/Prompt.hh
new file mode 100644
index 0000000..32497b0
--- /dev/null
+++ b/src/Titon/Console/UserInput/Prompt.hh
@@ -0,0 +1,84 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\UserInput;
+
+use Titon\Console\Output;
+
+class Prompt extends AbstractUserInput {
+
+    protected Map<mixed, mixed> $acceptedValues = Map {};
+
+    protected string $hint = '';
+
+    public function __construct(Map<mixed, mixed> $choices = Map {}, ?string $default = null) {
+        parent::__construct();
+
+        $this->default = $default;
+        $this->acceptedValues = $choices;
+    }
+
+    public function prompt(string $message): string {
+        $keys = $this->acceptedValues->keys();
+        $values = $this->acceptedValues->values();
+        if ($this->hint !== '') {
+            $message .= " $this->hint";
+        }
+
+        while (true) {
+            $this->output->out("$message: ", Output::VERBOSITY_NORMAL, 0);
+            $input = $this->input->getUserInput();
+
+            if ($input === '' && !is_null($this->default)) {
+                $input = $this->default;
+            }
+
+            if ($this->acceptedValues->isEmpty()) {
+                return $input;
+            }
+
+            if (is_numeric($input)) {
+                $input--;
+                if (!is_null($values[$input])) {
+                    return $keys[$input];
+                }
+
+                if ($input < 0 || $input >= $values->count()) {
+                    $this->output->error('Invalid menu selection: out of range');
+                }
+            } else {
+                foreach ($values as $index => $val) {
+                    if ($this->strict) {
+                        if ($input === $val) {
+                            return $keys[$index];
+                        }
+                    } else {
+                        if (strtolower($input) === strtolower($val)) {
+                            return $keys[$index];
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    public function showHints(bool $showHint = true): this {
+        if ($showHint === true) {
+            $retval = Vector {};
+            foreach ($this->acceptedValues as $k => $v) {
+                $retval[] = $v;
+            }
+            $retval = implode('/', $retval);
+
+            $this->hint = "[$retval]";
+        } else {
+            $this->hint = '';
+        }
+
+        return $this;
+    }
+}
\ No newline at end of file

From 5eef7ab7f8cb42269b5185c46c06f370ea5112a0 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Sun, 8 Mar 2015 10:25:26 -0400
Subject: [PATCH 33/92] fixed type checker errors

---
 src/Titon/Console/UserInput.hh                |  2 +-
 .../Console/UserInput/AbstractUserInput.hh    |  2 +-
 src/Titon/Console/UserInput/Confirm.hh        | 20 ++++++++++---------
 src/Titon/Console/UserInput/Menu.hh           |  5 ++---
 src/Titon/Console/UserInput/Prompt.hh         |  5 ++---
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/Titon/Console/UserInput.hh b/src/Titon/Console/UserInput.hh
index 74b3344..0d1a294 100644
--- a/src/Titon/Console/UserInput.hh
+++ b/src/Titon/Console/UserInput.hh
@@ -9,5 +9,5 @@ namespace Titon\Console;
 
 interface UserInput {
 
-    public function prompt(string $message): string;
+    public function prompt(string $message): mixed;
 }
\ No newline at end of file
diff --git a/src/Titon/Console/UserInput/AbstractUserInput.hh b/src/Titon/Console/UserInput/AbstractUserInput.hh
index e23942c..76bbd55 100644
--- a/src/Titon/Console/UserInput/AbstractUserInput.hh
+++ b/src/Titon/Console/UserInput/AbstractUserInput.hh
@@ -13,7 +13,7 @@ use Titon\Console\UserInput;
 
 abstract class AbstractUserInput implements UserInput {
 
-    protected Vector<string> $acceptedValues = Vector {};
+    protected Map<mixed, mixed> $acceptedValues = Map {};
 
     protected ?string $default;
 
diff --git a/src/Titon/Console/UserInput/Confirm.hh b/src/Titon/Console/UserInput/Confirm.hh
index d831379..44d4f06 100644
--- a/src/Titon/Console/UserInput/Confirm.hh
+++ b/src/Titon/Console/UserInput/Confirm.hh
@@ -11,14 +11,16 @@ use Titon\Console\Output;
 
 class Confirm extends AbstractUserInput {
 
+    protected string $message;
+
     public function __construct(?string $default = null) {
         parent::__construct();
 
-        $this->acceptedValues = Vector {
-            'y',
-            'yes',
-            'n',
-            'no'
+        $this->acceptedValues = Map {
+            0 => 'y',
+            1 => 'yes',
+            2 => 'n',
+            3 => 'no'
         };
 
         switch (strtolower($default)) {
@@ -40,8 +42,8 @@ class Confirm extends AbstractUserInput {
         $this->message = $message;
     }
 
-    public function confirmed(): bool {
-        $input = $this->prompt();
+    public function confirmed(string $message): bool {
+        $input = $this->prompt($message);
 
         switch (strtolower($input)) {
             case 'y':
@@ -55,7 +57,7 @@ class Confirm extends AbstractUserInput {
     }
 
     public function prompt(string $message): string {
-        $this->message = "$message $this->message";
+        $message = "$message $this->message";
 
         do {
             $this->output->out("$this->message ", Output::VERBOSITY_NORMAL, 0);
@@ -63,7 +65,7 @@ class Confirm extends AbstractUserInput {
             if ($input === '' && !is_null($this->default)) {
                 $input = $this->default;
             }
-        } while ($this->acceptedValues->linearSearch(strtolower($input)) < 0);
+        } while (!$this->acceptedValues->contains($input));
 
         return $input;
     }
diff --git a/src/Titon/Console/UserInput/Menu.hh b/src/Titon/Console/UserInput/Menu.hh
index 708e2f7..fb8bcb7 100644
--- a/src/Titon/Console/UserInput/Menu.hh
+++ b/src/Titon/Console/UserInput/Menu.hh
@@ -11,8 +11,6 @@ use Titon\Console\Output;
 
 class Menu extends AbstractUserInput {
 
-    protected Map<mixed, mixed> $acceptedValues;
-
     protected string $message;
 
     public function __construct(Map<mixed, mixed> $choices, string $message = '') {
@@ -22,7 +20,7 @@ class Menu extends AbstractUserInput {
         $this->message = $message;
     }
 
-    public function prompt(string $prompt): string {
+    public function prompt(string $prompt): mixed {
         $keys = $this->acceptedValues->keys();
         $values = $this->acceptedValues->values();
 
@@ -40,6 +38,7 @@ class Menu extends AbstractUserInput {
             $input = $this->input->getUserInput();
 
             if (is_numeric($input)) {
+                $input = (int)$input;
                 $input--;
                 if (!is_null($values[$input])) {
                     return $keys[$input];
diff --git a/src/Titon/Console/UserInput/Prompt.hh b/src/Titon/Console/UserInput/Prompt.hh
index 32497b0..af39ccf 100644
--- a/src/Titon/Console/UserInput/Prompt.hh
+++ b/src/Titon/Console/UserInput/Prompt.hh
@@ -11,8 +11,6 @@ use Titon\Console\Output;
 
 class Prompt extends AbstractUserInput {
 
-    protected Map<mixed, mixed> $acceptedValues = Map {};
-
     protected string $hint = '';
 
     public function __construct(Map<mixed, mixed> $choices = Map {}, ?string $default = null) {
@@ -22,7 +20,7 @@ class Prompt extends AbstractUserInput {
         $this->acceptedValues = $choices;
     }
 
-    public function prompt(string $message): string {
+    public function prompt(string $message): mixed {
         $keys = $this->acceptedValues->keys();
         $values = $this->acceptedValues->values();
         if ($this->hint !== '') {
@@ -42,6 +40,7 @@ class Prompt extends AbstractUserInput {
             }
 
             if (is_numeric($input)) {
+                $input = (int)$input;
                 $input--;
                 if (!is_null($values[$input])) {
                     return $keys[$input];

From 286041d6c3db52c39f551285627ec4aa39f562c9 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Sun, 8 Mar 2015 16:05:08 -0400
Subject: [PATCH 34/92] added documetation, fixed some type check errors

---
 src/Titon/Console/Command/AbstractCommand.hh  |  27 +-
 src/Titon/Console/Console.hh                  | 101 +++++++-
 .../Exception/InvalidCharacterSequence.hh     |  20 ++
 .../InvalidNumberOfCommandsException.hh       |  20 ++
 src/Titon/Console/Feedback.hh                 |  63 ++++-
 .../Console/Feedback/AbstractFeedback.hh      | 239 ++++++++++++++++--
 src/Titon/Console/Feedback/ProgressBar.hh     |  39 ++-
 src/Titon/Console/Feedback/Wait.hh            |  40 +--
 src/Titon/Console/HelpScreen.hh               |  20 +-
 src/Titon/Console/Input.hh                    |  72 +++++-
 .../AbstractInputDefinition.hh                |   6 +-
 src/Titon/Console/InputDefinition/Argument.hh |   3 +-
 src/Titon/Console/InputLexer.hh               |   5 +-
 src/Titon/Console/Output.hh                   | 126 ++++++++-
 src/Titon/Console/StyleDefinition.hh          |  87 +++++++
 src/Titon/Console/System.hh                   |  25 ++
 src/Titon/Console/System/AbstractSystem.hh    |  27 ++
 src/Titon/Console/System/Linux.hh             |  14 +
 src/Titon/Console/System/SystemFactory.hh     |  11 +
 src/Titon/Console/System/Windows.hh           |  25 ++
 src/Titon/Console/UserInput.hh                |  12 +
 .../Console/UserInput/AbstractUserInput.hh    |  52 +++-
 src/Titon/Console/UserInput/Menu.hh           |  19 ++
 src/Titon/Console/UserInput/Prompt.hh         |  28 ++
 src/Titon/Console/bootstrap.hh                |   2 +
 src/Titon/Console/composer.json               |   1 -
 26 files changed, 993 insertions(+), 91 deletions(-)
 create mode 100644 src/Titon/Console/Exception/InvalidCharacterSequence.hh
 create mode 100644 src/Titon/Console/Exception/InvalidNumberOfCommandsException.hh

diff --git a/src/Titon/Console/Command/AbstractCommand.hh b/src/Titon/Console/Command/AbstractCommand.hh
index fa4ef89..24d797b 100644
--- a/src/Titon/Console/Command/AbstractCommand.hh
+++ b/src/Titon/Console/Command/AbstractCommand.hh
@@ -13,10 +13,11 @@ use Titon\Console\Input;
 use Titon\Console\InputDefinition\Argument;
 use Titon\Console\InputDefinition\Flag;
 use Titon\Console\InputDefinition\Option;
+use Titon\Console\Output;
 
 /**
- * A Command is a class that configures necessary command line inputs from the
- * user and executes its `run` command when called.
+ * A `Command` is a class that configures necessary command line inputs from the
+ * user and executes its `run` method when called.
  *
  * @package Titon\Console\Command
  */
@@ -29,20 +30,12 @@ abstract class AbstractCommand implements Command {
      */
     protected InputBag<Argument> $arguments;
 
-    /**
-     * The `Input` object containing all registered and parsed command line
-     * parameters.
-     *
-     * @var \Titon\Console\Input
-     */
-    protected Input $input;
-
     /**
      * The description of the command used when rendering its help screen.
      *
      * @var string
      */
-    protected string $description;
+    protected string $description = '';
 
     /**
      * Bag container holding all registered `Flag` objects
@@ -51,6 +44,14 @@ abstract class AbstractCommand implements Command {
      */
     protected InputBag<Flag> $flags;
 
+    /**
+     * The `Input` object containing all registered and parsed command line
+     * parameters.
+     *
+     * @var \Titon\Console\Input
+     */
+    protected Input $input;
+
     /**
      * The name of the command passed into the command line.
      *
@@ -65,6 +66,8 @@ abstract class AbstractCommand implements Command {
      */
     protected InputBag<Option> $options;
 
+    protected Output $output;
+
     /**
      * Construct a new instance of a command.
      */
@@ -73,6 +76,8 @@ abstract class AbstractCommand implements Command {
         $this->arguments = new InputBag();
         $this->flags = new InputBag();
         $this->options = new InputBag();
+
+        $this->output = Output::getInstance();
     }
 
     /**
diff --git a/src/Titon/Console/Console.hh b/src/Titon/Console/Console.hh
index ba8964f..18c5124 100644
--- a/src/Titon/Console/Console.hh
+++ b/src/Titon/Console/Console.hh
@@ -7,17 +7,112 @@
 
 namespace Titon\Console;
 
+use Titon\Console\Input;
+use Titon\Console\Output;
+use Titon\Console\InputDefinition\Flag;
+
+/**
+ * The `Console` class bootstraps and handles Input and Output to process and
+ * run necessary commands.
+ *
+ * @package Titon\Console
+ */
 class Console {
 
-    protected CommandMap $commands = Map {};
+    /**
+     * The `Command` object to run
+     *
+     * @var \Titon\Console\Command|null
+     */
+    protected ?Command $command;
 
-    public function __construct() {
+    /**
+     * The `Input` object used to retrieve parsed parameters and commands.
+     *
+     * @var \Titon\Console\Input
+     */
+    protected Input $input;
+
+    /**
+     * The `Output` object used to send response data to the user.
+     *
+     * @var \Titon\Console\Output
+     */
+    protected Output $output;
 
+    /**
+     * Construct a new `Console` application.
+     */
+    public function __construct() {
+        $this->input = Input::getInstance();
+        $this->output = Output::getInstance();
     }
 
+    /**
+     * Add a `Command` to the application to be parsed by the `Input`.
+     *
+     * @param Command $command  The `Command` object to add
+     *
+     * @return $this
+     */
     public function addCommand(Command $command): this {
-        $this->commands[$command->getName()] = $command;
+        $command->setInput($this->input);
+        $command->configure();
+
+        $this->input->addCommand($command);
 
         return $this;
     }
+
+    /**
+     * Bootstrap the `Console` application with default parameters and global
+     * settings.
+     */
+    protected function bootstrap(): void {
+        $this->input->addFlag((new Flag('help', 'Display this help screen.'))->alias('h'));
+    }
+
+    /**
+     * Run the `Console` application.
+     */
+    public function run(): void {
+        $this->bootstrap();
+        $this->command = $this->input->getActiveCommand();
+        if (is_null($this->command)) {
+            $this->input->parse();
+            $this->renderHelpScreen();
+        } else {
+            $this->runCommand($this->command);
+        }
+    }
+
+    /**
+     * Register and run the `Command` object.
+     *
+     * @param Command $command  The `Command` to run
+     */
+    public function runCommand(Command $command): void {
+        $command->registerInput();
+        $this->input->parse();
+
+        if (!is_null($this->input->getFlag('help')) && $this->input->getFlag('help')->getValue() === 1) {
+            $this->renderHelpScreen($command);
+        } else {
+            $command->run();
+        }
+    }
+
+    /**
+     * Render the help screen for the application or the `Command` passed in.
+     *
+     * @param \Titon\Console\Command|null $command  The `Command` to render usage for
+     */
+    public function renderHelpScreen(?Command $command = null): void {
+        $helpScreen = new HelpScreen($this->input);
+        if (!is_null($command)) {
+            $helpScreen->setCommand($command);
+        }
+
+        $this->output->out($helpScreen->render());
+    }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/Exception/InvalidCharacterSequence.hh b/src/Titon/Console/Exception/InvalidCharacterSequence.hh
new file mode 100644
index 0000000..c02f201
--- /dev/null
+++ b/src/Titon/Console/Exception/InvalidCharacterSequence.hh
@@ -0,0 +1,20 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\Exception;
+
+use RuntimeException;
+
+/**
+ * Exception thrown when an invalid character sequence is used in a `Feedback`
+ * class.
+ *
+ * @package Titon\Context\Exception
+ */
+class InvalidCharacterSequence extends RuntimeException {
+
+}
diff --git a/src/Titon/Console/Exception/InvalidNumberOfCommandsException.hh b/src/Titon/Console/Exception/InvalidNumberOfCommandsException.hh
new file mode 100644
index 0000000..60c2b9f
--- /dev/null
+++ b/src/Titon/Console/Exception/InvalidNumberOfCommandsException.hh
@@ -0,0 +1,20 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\Exception;
+
+use RuntimeException;
+
+/**
+ * Exception thrown when an invalid number of commands is passed into the
+ * application.
+ *
+ * @package Titon\Context\Exception
+ */
+class InvalidNumberOfCommandsException extends RuntimeException {
+
+}
diff --git a/src/Titon/Console/Feedback.hh b/src/Titon/Console/Feedback.hh
index 9ec4b23..1b89389 100644
--- a/src/Titon/Console/Feedback.hh
+++ b/src/Titon/Console/Feedback.hh
@@ -7,17 +7,78 @@
 
 namespace Titon\Console;
 
+/**
+ * A `Feedback` class handles the displaying of progress information to the user
+ * for a specific task.
+ *
+ * @package Titon\Console
+ */
 interface Feedback {
 
-    public function advance(): void;
+    /**
+     * Progress the feedback display.
+     *
+     * @return mixed
+     */
+    public function advance(int $increment = 1): void;
 
+    /**
+     * Force the feedback to end its output.
+     *
+     * @return mixed
+     */
     public function finish(): void;
 
+    /**
+     * Set the frequency the feedback should update.
+     *
+     * @param int $interval The interval (in miliseconds)
+     *
+     * @return $this
+     */
+    public function setInterval(int $interval): this;
+
+    /**
+     * Set the message presented to the user to signify what the feedback
+     * is referring to.
+     *
+     * @param string $message
+     *
+     * @return mixed
+     */
     public function setMessage(string $message): this;
 
+    /**
+     * A template string used to construct additional information displayed before
+     * the feedback indicator. The supported variables include message, percent,
+     * elapsed, and estimated. These variables are denoted in the template '{:}'
+     * notation. (i.e., '{:message} {:percent}').
+     *
+     * @param string $prefix
+     *
+     * @return mixed
+     */
     public function setPrefix(string $prefix): this;
 
+    /**
+     * A template string used to construct additional information displayed after
+     * the feedback indicator. The supported variables include message, percent,
+     * elapsed, and estimated. These variables are denoted in the template '{:}'
+     * notation. (i.e., '{:message} {:percent}').
+     *
+     * @param string $suffix
+     *
+     * @return mixed
+     */
     public function setSuffix(string $suffix): this;
 
+    /**
+     * Set the total number of cycles (`advance` calls) the feedback should be
+     * expected to take.
+     *
+     * @param int $total    The number of cycles
+     *
+     * @return mixed
+     */
     public function setTotal(int $total): this;
 }
\ No newline at end of file
diff --git a/src/Titon/Console/Feedback/AbstractFeedback.hh b/src/Titon/Console/Feedback/AbstractFeedback.hh
index de23f62..a645996 100644
--- a/src/Titon/Console/Feedback/AbstractFeedback.hh
+++ b/src/Titon/Console/Feedback/AbstractFeedback.hh
@@ -10,35 +10,136 @@ namespace Titon\Console\Feedback;
 use Titon\Console\Feedback;
 use Titon\Console\Output;
 
+/**
+ * `AbstractFeedback` class handles core functionality for calculating and
+ * displaying the progress information.
+ *
+ * @package Titon\Console\Feedback
+ */
 abstract class AbstractFeedback implements Feedback {
 
+    /**
+     * Characters used in displaying the feedback in the output.
+     *
+     * @var string
+     */
+    protected Vector<string> $characterSequence;
+
+    /**
+     * The current cycle out of the given total.
+     *
+     * @var int
+     */
     protected int $current = 0;
 
+    /**
+     * The format the feedback indicator will be displayed as.
+     *
+     * @var string
+     */
     protected string $format = '{:prefix}{:feedback}{:suffix}';
 
-    protected int $interval;
-
+    /**
+     * The current iteration of the feedback used to calculate the speed.
+     *
+     * @var int
+     */
+    protected int $interation = 0;
+
+    /**
+     * The interval (in miliseconds) between updates of the indicator.
+     *
+     * @var int
+     */
+    protected int $interval = 100;
+
+    /**
+     * The max length of the characters in the character sequence.
+     *
+     * @var int
+     */
+    protected int $maxLength = 1;
+
+    /**
+     * The message to be displayed with the feedback.
+     *
+     * @var string
+     */
     protected string $message;
 
+    /**
+     * The `Output` used for displaying the feedback information.
+     *
+     * @var \Titon\Console\Output
+     */
     protected Output $output;
 
+    /**
+     * The template used to prefix the output.
+     *
+     * @var string
+     */
     protected string $prefix = '{:message}  {:percent}% [';
 
+    /**
+     * The current speed of the feedback.
+     *
+     * @var float
+     */
+    protected float $speed = 0.0;
+
+    /**
+     * The time the feedback started.
+     *
+     * @var int|null
+     */
     protected ?int $start;
 
+    /**
+     * The template used to suffix the output.
+     *
+     * @var string
+     */
     protected string $suffix = '] {:elapsed} / {:estimated}';
 
+    /**
+     * The current tick used to calculate the speed.
+     *
+     * @var int|null
+     */
+    protected ?int $tick;
+
+    /**
+     * The feedback running time.
+     *
+     * @var int|null
+     */
     protected ?int $timer;
 
+    /**
+     * The total number of cycles expected for the feedback to take until finished.
+     *
+     * @var int
+     */
     protected int $total = 0;
 
+    /**
+     * Create a new instance of the `Feedback`.
+     *
+     * @param int    $total     The total number of cycles
+     * @param string $message   The message to be displayed with the feedback
+     * @param int    $interval  The interval the feedback should update in
+     */
     public function __construct(int $total = 0, string $message = '', int $interval = 100) {
-        $this->output = new Output();
+        $this->output = Output::getInstance();
         $this->message = $message;
         $this->interval = $interval;
         $this->setTotal($total);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function advance(int $increment = 1): void {
         $this->current = min($this->total, $this->current + $increment);
 
@@ -47,6 +148,12 @@ abstract class AbstractFeedback implements Feedback {
         }
     }
 
+    /**
+     * Build and return all variables that are accepted when building the prefix
+     * and suffix for the output.
+     *
+     * @return Map<string, mixed>
+     */
     protected function buildOutputVariables(): Map<string, mixed> {
         $message = $this->message;
         $percent = str_pad(floor($this->getPercentageComplete() * 100), 3);;
@@ -65,14 +172,19 @@ abstract class AbstractFeedback implements Feedback {
         return $variables;
     }
 
-    protected function current(): int {
-        $size = strlen($this->getTotal());
-
-        return str_pad(number_format($this->current), $size);
-    }
-
+    /**
+     * Method used to format and output the display of the feedback.
+     *
+     * @param bool $finish If this is the finishing display of the feedback
+     */
     abstract protected function display(bool $finish = false): void;
 
+    /**
+     * Given the speed and currently elapsed time, calculate the estimated time
+     * remaining.
+     *
+     * @return float
+     */
     protected function estimateTimeRemaining(): float {
         $speed = $this->getSpeed();
         if (is_null($speed) || !$this->getElapsedTime()) {
@@ -82,12 +194,23 @@ abstract class AbstractFeedback implements Feedback {
         return round($this->total / $speed);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function finish(): void {
         $this->current = $this->total;
         $this->display(true);
         $this->output->out();
     }
 
+    /**
+     * Format the given template to replace denoted variables with their values.
+     *
+     * @param string $message   The template to format
+     * @param        Map $      The variables available
+     *
+     * @return string
+     */
     protected function format(string $message, Map<string, mixed> $args = Map {}): string {
         if ($args->isEmpty()) {
             return $message;
@@ -100,12 +223,22 @@ abstract class AbstractFeedback implements Feedback {
         return $message;
     }
 
+    /**
+     * Format the given time for output.
+     *
+     * @param int $time The timestamp to format
+     */
     protected function formatTime(int $time): string {
         return floor($time / 60) . ':' . str_pad(
             $time % 60, 2, 0, STR_PAD_LEFT
         );
     }
 
+    /**
+     * Retrieve the current elapsed time.
+     *
+     * @var int
+     */
     protected function getElapsedTime(): int {
         if (is_null($this->start)) {
             return 0;
@@ -114,6 +247,12 @@ abstract class AbstractFeedback implements Feedback {
         return (time() - $this->start);
     }
 
+    /**
+     * Retrieve the percentage complete based on the current cycle and the total
+     * number of cycles.
+     *
+     * @return float
+     */
     protected function getPercentageComplete(): float {
         if ($this->total == 0) {
             return 1.0;
@@ -122,56 +261,118 @@ abstract class AbstractFeedback implements Feedback {
         return (float)($this->current / $this->total);
     }
 
+    /**
+     * Get the current speed of the feedback.
+     *
+     * @return float
+     */
     protected function getSpeed(): float {
-        static $tick, $iteration = 0, $speed = 0;
-
         if (is_null($this->start)) {
             return 0.0;
         }
 
-        if (is_null($tick)) {
-            $tick = $this->start;
+        if (is_null($this->tick)) {
+            $this->tick = $this->start;
         }
 
         $now = microtime(true);
-        $span = $now - $tick;
+        $span = $now - $this->tick;
         if ($span > 1) {
-            $iteration++;
-            $tick = $now;
-            $speed = ($this->current / $iteration) / $span;
+            $this->iteration++;
+            $this->tick = $now;
+            $this->speed = (float)(($this->current / $this->iteration) / $span);
         }
 
-        return (float)$speed;
+        return $this->speed;
     }
 
-    protected function getTotal(): mixed {
+    /**
+     * Retrieve the total number of cycles the feedback should take.
+     *
+     * @return int
+     */
+    protected function getTotal(): int {
         return number_format($this->total);
     }
 
+    /**
+     * Set the characters used in the output.
+     *
+     * @param Vector<string> $characters    The characters to use
+     *
+     * @return $this
+     */
+    public function setCharacterSequence(Vector<string> $characters): this {
+        $this->characterSequence = $characters;
+        $this->setMaxLength();
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setInterval(int $interval): this {
+        $this->interval = $interval;
+
+        return $this;
+    }
+
+    /**
+     * Set the maximum length of the available character sequence characters.
+     *
+     * @return $this
+     */
+    protected function setMaxLength(): this {
+        $this->maxLength = max(array_map(($key) ==> {
+            return strlen($key);
+        }, $this->characterSequence));
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
     public function setMessage(string $message): this {
         $this->message = $message;
 
         return $this;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function setPrefix(string $prefix): this {
         $this->prefix = $prefix;
 
         return $this;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function setSuffix(string $sufix): this {
         $this->suffix = $sufix;
 
         return $this;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function setTotal(int $total): this {
         $this->total = (int)$total;
 
         return $this;
     }
 
+    /**
+     * Determine if the feedback should update its output based on the current
+     * time, start time, and set interval.
+     *
+     * @return bool
+     */
     protected function shouldUpdate(): bool {
         $now = microtime(true) * 1000;
 
diff --git a/src/Titon/Console/Feedback/ProgressBar.hh b/src/Titon/Console/Feedback/ProgressBar.hh
index eb5cdd9..04dae02 100644
--- a/src/Titon/Console/Feedback/ProgressBar.hh
+++ b/src/Titon/Console/Feedback/ProgressBar.hh
@@ -10,14 +10,38 @@ namespace Titon\Console\Feedback;
 use Titon\Console\Output;
 use Titon\Console\System\SystemFactory;
 
+/**
+ * The `ProgressBar` class displays feedback information with a progress bar.
+ * Additional information including percentage done, time elapsed, and time
+ * remaining is included by default.
+ *
+ * @package Titon\Console\Feedback
+ */
 class ProgressBar extends AbstractFeedback {
 
-    protected string $bar = '=>';
+    /**
+     * The 2-string character format to use when constructing the displayed bar.
+     *
+     * @var string
+     */
+    protected Vector<string> $characterSequence = Vector {
+        '=',
+        '>'
+    };
 
+    /**
+     * {@inheritdoc}
+     */
     protected string $prefix = '{:message}  {:percent}% [';
 
+    /**
+     * {@inheritdoc}
+     */
     protected string $suffix = '] {:elapsed} / {:estimated}';
 
+    /**
+     * {@inheritdoc}
+     */
     protected function display(bool $finish = false): void {
         $completed = $this->getPercentageComplete();
         $variables = $this->buildOutputVariables();
@@ -34,7 +58,7 @@ class ProgressBar extends AbstractFeedback {
         }
 
         // substr is needed to trim off the bar cap at 100%
-        $bar = str_repeat($this->bar[0], floor($completed * $size)) . $this->bar[1];
+        $bar = str_repeat($this->characterSequence[0], floor($completed * $size)) . $this->characterSequence[1];
         $bar = substr(str_pad($bar, $size, ' '), 0, $size);
 
         $variables = Map {
@@ -45,4 +69,15 @@ class ProgressBar extends AbstractFeedback {
 
         $this->output->out($this->format($this->format, $variables), Output::VERBOSITY_NORMAL, 1, Output::CR);
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setCharacterSequence(Vector<string> $characters): this {
+        if ($characters->count() !== 2) {
+            throw new InvalidCharacterSequence("Display bar must only contain 2 values");
+        }
+
+        parent::setCharacterSequence($characters);
+    }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/Feedback/Wait.hh b/src/Titon/Console/Feedback/Wait.hh
index 491ca32..94257bd 100644
--- a/src/Titon/Console/Feedback/Wait.hh
+++ b/src/Titon/Console/Feedback/Wait.hh
@@ -10,8 +10,16 @@ namespace Titon\Console\Feedback;
 use Titon\Console\Output;
 use Titon\Console\System\SystemFactory;
 
+/**
+ * The `Wait` class displays feedback by cycling through a series of characters.
+ *
+ * @package Titon\Console\Feedback
+ */
 class Wait extends AbstractFeedback {
 
+    /**
+     * {@inheritdoc}
+     */
     protected Vector<string> $characterSequence = Vector {
         '-',
         '\\',
@@ -19,18 +27,27 @@ class Wait extends AbstractFeedback {
         '/'
     };
 
-    protected int $iteration = 0;
-
-    protected int $maxLength = 1;
-
+    /**
+     * {@inheritdoc}
+     */
     protected string $prefix = " {:message}";
 
+    /**
+     * {@inheritdoc}
+     */
     protected string $suffix = "";
 
+    /**
+     * {@inheritdoc}
+     */
     public function __construct(int $total = 0, string $message = '', int $interval = 100) {
         parent::__construct($total, $message, $interval);
+        $this->iteration = 0;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function display(bool $finish = false): void {
         $variables = $this->buildOutputVariables();
 
@@ -55,19 +72,4 @@ class Wait extends AbstractFeedback {
             Output::CR
         );
     }
-
-    public function setCharacterSequence(Vector<string> $characters): this {
-        $this->characterSequence = $characters;
-        $this->setMaxLength();
-
-        return $this;
-    }
-
-    protected function setMaxLength(): this {
-        $this->maxLength = max(array_map(($key) ==> {
-            return strlen($key);
-        }, $this->characterSequence));
-
-        return $this;
-    }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/HelpScreen.hh b/src/Titon/Console/HelpScreen.hh
index 2ab875f..ff78898 100644
--- a/src/Titon/Console/HelpScreen.hh
+++ b/src/Titon/Console/HelpScreen.hh
@@ -86,7 +86,6 @@ class HelpScreen {
         $retval = Vector {};
 
         $retval[] = $this->renderHeading();
-
         $retval[] = $this->renderUsage();
 
         if (!$this->arguments->all()->isEmpty()) {
@@ -170,7 +169,7 @@ class HelpScreen {
             array_push($output, $formatted);
         }
 
-        return join($output, "\n");
+        return "Available Commands:\n" . join($output, "\n");
     }
 
     /**
@@ -257,17 +256,22 @@ class HelpScreen {
 
             $usage[] = $command->getName();
 
-            foreach ($command->getArguments() as $argument) {
-                $arg = $argument->getName();
+            foreach ($command->getFlags() as $argument) {
+                $arg = $argument->getFormattedName($argument->getName());
+                if ($alias = $argument->getFormattedName($argument->getAlias())) {
+                    $arg .= "|$alias";
+                }
+
                 if ($argument->getMode() === AbstractInputDefinition::MODE_OPTIONAL) {
                     $usage[] = "[$arg]";
                 }
             }
-            foreach ($command->getArguments() as $argument) {
-                $arg = $argument->getName();
-                if ($argument->getAlias()) {
-                    $arg = "$arg|{$argument->getAlias()}";
+            foreach ($command->getOptions() as $argument) {
+                $arg = $argument->getFormattedName($argument->getName());
+                if ($alias = $argument->getFormattedName($argument->getAlias())) {
+                    $arg .= "|$alias";
                 }
+
                 if ($argument->getMode() === AbstractInputDefinition::MODE_OPTIONAL) {
                     $usage[] = "[$arg]";
                 }
diff --git a/src/Titon/Console/Input.hh b/src/Titon/Console/Input.hh
index 9705734..5f6d57a 100644
--- a/src/Titon/Console/Input.hh
+++ b/src/Titon/Console/Input.hh
@@ -7,13 +7,12 @@
 
 namespace Titon\Console;
 
-use Titon\Common\ArgumentList;
 use Titon\Utility\State\Server;
 use Titon\Console\InputDefinition\Argument;
 use Titon\Console\InputDefinition\Flag;
 use Titon\Console\InputDefinition\Option;
 use Titon\Console\Exception\MissingValueException;
-use Titon\Console\Exception\InvalidCommandException;
+use Titon\Console\Exception\InvalidNumberOfCommandsException;
 
 /**
  * The `Input` class contains all available `Flag`, `Argument`, `Option`, and
@@ -60,6 +59,13 @@ class Input {
      */
     protected InputLexer $input;
 
+    /**
+     * The singleton instance.
+     *
+     * @var \Titon\Console\Input|null
+     */
+    protected static ?Input $instance;
+
     /**
      * All parameters provided in the input that do not match a given `Command`
      * or `InputDefinition`.
@@ -75,6 +81,8 @@ class Input {
      */
     protected InputBag<Option> $options;
 
+    protected array<string> $rawInput;
+
     /**
      * Stream handle for user input.
      *
@@ -100,6 +108,7 @@ class Input {
             $args = array_slice(Server::get('argv'), 1);
         }
 
+        $this->rawInput = $args;
         $this->input = new InputLexer($args);
         $this->flags = new InputBag();
         $this->options = new InputBag();
@@ -161,6 +170,30 @@ class Input {
         return $this;
     }
 
+    /**
+     * Parse and retrieve the active command from the raw input.
+     *
+     * @return \Titon\Console\Command|null
+     */
+    public function getActiveCommand(): ?Command {
+        if (!is_null($this->command)) {
+            return $this->command;
+        }
+
+        $input = $this->rawInput;
+        foreach ($input as $index => $value) {
+            if ($command = $this->commands[$value]) {
+                $this->command = $command;
+                unset($input[$index]);
+                $this->setInput($input);
+
+                return $this->command;
+            }
+        }
+
+        return null;
+    }
+
     /**
      * Retrieve an `Argument` by its key or alias. Returns null if none exists.
      *
@@ -221,6 +254,19 @@ class Input {
         return $this->flags;
     }
 
+    /**
+     * Create and return the singleton instance.
+     *
+     * @return \Titon\Console\Input
+     */
+    public static function getInstance(): Input {
+        if (is_null(self::$instance)) {
+            self::$instance = new Input();
+        }
+
+        return self::$instance;
+    }
+
     /**
      * Retrieve an `Option` by its key or alias. Returns null if none exists.
      *
@@ -276,6 +322,17 @@ class Input {
                 continue;
             }
 
+            if (is_null($this->command)) {
+                if (!is_null($command = $this->commands[$val['value']])) {
+                    $this->command = $command;
+                    continue;
+                }
+            } else {
+                if (!is_null($command = $this->commands[$val['value']])) {
+                    throw new InvalidNumberOfCommandsException("Multiple commands are not supported.");
+                }
+            }
+
             $this->invalid[] = $val;
         }
     }
@@ -289,17 +346,6 @@ class Input {
      * @return bool
      */
     protected function parseArgument(RawInput $input): bool {
-        // The first `argument` parsed needs to be a valid command
-        if (is_null($this->command)) {
-            if (!$this->commands->contains($input['raw'])) {
-                throw new InvalidCommandException("Command `{$input['raw']}` is not a valid command.");
-            }
-
-            $this->command = $this->commands->get($input['raw']);
-
-            return true;
-        }
-
         foreach ($this->arguments as $argument) {
             if (is_null($argument->getValue())) {
                 $argument->setValue($input['raw']);
diff --git a/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh b/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
index 8e8baf8..b014792 100644
--- a/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
+++ b/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
@@ -65,9 +65,9 @@ abstract class AbstractInputDefinition implements InputDefinition {
     /**
      * Cosntruct a new instance of an `InputDefinition`.
      *
-     * @param string $name
-     * @param string $description
-     * @param int    $mode
+     * @param string $name          The name of the parameter
+     * @param string $description   The description used in displaying usage
+     * @param int    $mode          The mode of the definition
      */
     public function __construct(string $name, string $description = '', int $mode = self::MODE_OPTIONAL) {
         $this->name = $name;
diff --git a/src/Titon/Console/InputDefinition/Argument.hh b/src/Titon/Console/InputDefinition/Argument.hh
index 04674a3..3de20e2 100644
--- a/src/Titon/Console/InputDefinition/Argument.hh
+++ b/src/Titon/Console/InputDefinition/Argument.hh
@@ -18,7 +18,8 @@ class Argument extends AbstractInputDefinition {
     /**
      * {@inheritdoc}
      */
-    <<Override>> public function getFormattedName(string $name): string {
+    <<__Override>>
+    public function getFormattedName(string $name): string {
         return $name;
     }
 
diff --git a/src/Titon/Console/InputLexer.hh b/src/Titon/Console/InputLexer.hh
index b983777..70d6e83 100644
--- a/src/Titon/Console/InputLexer.hh
+++ b/src/Titon/Console/InputLexer.hh
@@ -8,7 +8,6 @@
 namespace Titon\Console;
 
 use Iterator;
-use Titon\Common\ArgumentList;
 
 /**
  * The `InputLexer` handles all parsing and pairing of the provided input.
@@ -127,7 +126,7 @@ class InputLexer implements Iterator<RawInput> {
      * @return bool
      */
     public function isLong(string $value): bool {
-         return (0 == strncmp($value, '--', 2));
+         return (0 === strncmp($value, '--', 2));
     }
 
     /**
@@ -138,7 +137,7 @@ class InputLexer implements Iterator<RawInput> {
      * @return bool
      */
     public function isShort(string $value): bool {
-        return !$this->isLong($value) && (0 == strncmp($value, '-', 1));
+        return !$this->isLong($value) && (0 === strncmp($value, '-', 1));
     }
 
     /**
diff --git a/src/Titon/Console/Output.hh b/src/Titon/Console/Output.hh
index c9c5db4..e9c1de5 100644
--- a/src/Titon/Console/Output.hh
+++ b/src/Titon/Console/Output.hh
@@ -7,6 +7,11 @@
 
 namespace Titon\Console;
 
+/**
+ * The `Output` class handles formatting and sending data to the ouput stream.
+ *
+ * @package Titon\Console
+ */
 class Output {
 
     const int VERBOSITY_QUIET = 0;
@@ -18,21 +23,65 @@ class Output {
     const string LF = PHP_EOL;
     const string CR = "\r";
 
+    /**
+     * The singleton instance.
+     *
+     * @var \Titon\Console\Output|null
+     */
+    protected static ?Output $instance;
+
+    /**
+     * The resource handle for standard error.
+     *
+     * @var resource
+     */
     protected resource $stderr;
 
+    /**
+     * The resource handle for standard output.
+     *
+     * @var resource
+     */
     protected resource $stdout;
 
-    protected Map<string, StyleDefinition> $styles = Map {};
-
+    /**
+     * Data structure containing available styles to apply to output.
+     *
+     * @var \Titon\Console\StyleMap
+     */
+    protected StyleMap $styles = Map {};
+
+    /**
+     * The global verbosity level for the `Output`.
+     *
+     * @var int
+     */
     protected int $systemVerbosity;
 
+    /**
+     * Construct a new `Output` object.
+     *
+     * @param int $verbosity    The verbosity level for the `Output`
+     */
     public function __construct(int $verbosity = self::VERBOSITY_NORMAL) {
         $this->stderr = fopen(Output::STREAM_STDERR, 'w');
         $this->stdout = fopen(Output::STREAM_STDOUT, 'w');
         $this->systemVerbosity = $verbosity;
+
+        if (is_null(self::$instance)) {
+            self::$instance = $this;
+        }
     }
 
-    public function error(string $output = '', int $verbosity = Output::VERBOSITY_NORMAL, int $newLines = 1): void {
+    /**
+     * Send output to the error stream.
+     *
+     * @param string $output        The contents to output
+     * @param int    $verbosity     The verbosity level of the output
+     * @param int    $newLines      The number of new lines to append to the output
+     * @param string $newlineChar   The new line character to use
+     */
+    public function error(string $output = '', int $verbosity = Output::VERBOSITY_NORMAL, int $newLines = 1, string $newlineChar = Output::LF): void {
         if (!$this->shouldOutput($verbosity)) {
             return;
         }
@@ -43,6 +92,13 @@ class Output {
         $this->send($output, $this->stderr);
     }
 
+    /**
+     * Format contents by parsing the style tags and applying necessary formatting.
+     *
+     * @param string $message   The message to format
+     *
+     * @string
+     */
     public function format(string $message): string {
         $parsedTags = array_unique($this->parseTags($message));
         $retval = $message;
@@ -60,6 +116,27 @@ class Output {
         return $retval;
     }
 
+    /**
+     * Create and return the singleton instance.
+     *
+     * @return \Titon\Console\Output
+     */
+    public static function getInstance(): Output {
+        if (is_null(self::$instance)) {
+            self::$instance = new Output();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Send output to the standard output stream.
+     *
+     * @param string $output        The contents to output
+     * @param int    $verbosity     The verbosity level of the output
+     * @param int    $newLines      The number of new lines to append to the output
+     * @param string $newlineChar   The new line character to use
+     */
     public function out(string $output = '', int $verbosity = Output::VERBOSITY_NORMAL, int $newLines = 1, string $newlineChar = Output::LF): void {
         if (!$this->shouldOutput($verbosity)) {
             return;
@@ -71,6 +148,13 @@ class Output {
         $this->send($output, $this->stdout);
     }
 
+    /**
+     * Parse all available style tags from the given contents.
+     *
+     * @param string $stringToParse The contents to parse
+     *
+     * @return array<string>
+     */
     protected function parseTags(string $stringToParse): array<string> {
         $tagsMatched = [];
         preg_match_all('#<([\w-]*?)>#', $stringToParse, $tagsMatched);
@@ -78,16 +162,48 @@ class Output {
         return $tagsMatched[1];
     }
 
+    /**
+     * Send the response through the given output stream.
+     *
+     * @param string   $response    The contents to send
+     * @param resource $stream      The output stream
+     */
+    protected function send(string $response, resource $stream): void {
+        fwrite($stream, $response);
+    }
+
+    /**
+     * Assign a `StyleDefinition` to an XML tag.
+     *
+     * @param string          $element  The element to assign
+     * @param StyleDefinition $format   The style to apply to the given tag
+     */
     public function setFormat(string $element, StyleDefinition $format): this {
         $this->styles[$element] = $format;
 
         return $this;
     }
 
-    protected function send(string $response, resource $stream): void {
-        fwrite($stream, $response);
+    /**
+     * Set the global verbosity of the `Output`.
+     *
+     * @param int $verbosity    The verbosity to set
+     *
+     * @return $this
+     */
+    public function setVerbosity(int $verbosity): this {
+        $this->verbosity = $verbosity;
+
+        return $this;
     }
 
+    /**
+     * Determine how the given verbosity compares to the class's verbosity level.
+     *
+     * @param int $verbosity    The verbosity to check
+     *
+     * @return bool
+     */
     protected function shouldOutput(int $verbosity): bool {
         if ($verbosity <= $this->systemVerbosity) {
             return true;
diff --git a/src/Titon/Console/StyleDefinition.hh b/src/Titon/Console/StyleDefinition.hh
index 34d4dc3..a9c910e 100644
--- a/src/Titon/Console/StyleDefinition.hh
+++ b/src/Titon/Console/StyleDefinition.hh
@@ -7,8 +7,18 @@
 
 namespace Titon\Console;
 
+/**
+ * A `StyleDefinition` defines how to style output it applies to.
+ *
+ * @package Titon\Console
+ */
 class StyleDefinition {
 
+    /**
+     * The background color to apply.
+     *
+     * @var string
+     */
     private string $bgColor;
 
     protected Map<string, int> $bgColorsMap = Map {
@@ -22,8 +32,18 @@ class StyleDefinition {
         'white'   => 47,
     };
 
+    /**
+     * The foreground color to apply.
+     *
+     * @var string
+     */
     private string $fgColor;
 
+    /**
+     * Data structure containing available foreground colors.
+     *
+     * @var Map<string, string>
+     */
     protected Map<string, string> $fgColorsMap = Map {
         'black'        => '0;30',
         'dark_gray'    => '1;30',
@@ -43,8 +63,18 @@ class StyleDefinition {
         'white'        => '1;37',
     };
 
+    /**
+     * The various effects to apply.
+     *
+     * @var Vector<string>
+     */
     private Vector<string> $effectsList;
 
+    /**
+     * Data structure containing available effects.
+     *
+     * @var Map<string, int>
+     */
     protected Map<string, int> $effectsMap = Map {
         'defaults'  => 0,
         'bold'      => 1,
@@ -54,12 +84,27 @@ class StyleDefinition {
         'conceal'   => 8,
     };
 
+    /**
+     * Create a new `StyleDefinition`.
+     *
+     * @param string $fgColor           The foreground color of the style
+     * @param string $bgColor           The background color of the style
+     * @param Vector<string> $effects   The effects of the style
+     */
     public function __construct(string $fgColor, string $bgColor = '', Vector<string> $effects = Vector {}) {
         $this->fgColor = $fgColor;
         $this->bgColor = $bgColor;
         $this->effectsList = $effects;
     }
 
+    /**
+     * Format the contents between the given XML tag with the style definition.
+     *
+     * @param string $xmlTag    The XML tag
+     * @param string $value     The contents to format
+     *
+     * @return string
+     */
     public function format(string $xmlTag, string $value): string {
         $values = $this->getValueBetweenTags($xmlTag, $value);
         $retval = $value;
@@ -73,6 +118,11 @@ class StyleDefinition {
         return $retval;
     }
 
+    /**
+     * Retrieve the background color code of the `StyleDefinition`.
+     *
+     * @return string
+     */
     public function getBgColorCode(): string {
         if (!is_null($bgColor = $this->bgColorsMap->get($this->bgColor))) {
             invariant(is_string($bgColor), "Must be a string.");
@@ -83,14 +133,29 @@ class StyleDefinition {
         return '';
     }
 
+    /**
+     * Retrieve the effects code of the `StyleDefinition`.
+     *
+     * @return string
+     */
     public function getEffectCode(string $effect): int {
         return $this->effectsMap[$effect];
     }
 
+    /**
+     * Retrieve the code to end the `StyleDefinition`.
+     *
+     * @return string
+     */
     public function getEndCode(): string {
         return "\033[0m";
     }
 
+    /**
+     * Retrieve the foreground color code of the `StyleDefinition`.
+     *
+     * @return string
+     */
     public function getFgColorCode(): string {
         if (!is_null($fgColor = $this->fgColorsMap->get($this->fgColor))) {
             invariant(is_string($fgColor), "Must be a string.");
@@ -101,6 +166,11 @@ class StyleDefinition {
         return '';
     }
 
+    /**
+     * Retrieve the string of effects to apply for the  `StyleDefinition`.
+     *
+     * @return string
+     */
     public function getParsedStringEffects(): string {
         $effects = Vector {};
 
@@ -113,6 +183,11 @@ class StyleDefinition {
         return implode(';', $effects);
     }
 
+    /**
+     * Retrieve the start code of the `StyleDefinition`.
+     *
+     * @return string
+     */
     public function getStartCode(): string {
         $colors = $this->getBgColorCode() . ';' . $this->getFgColorCode();
         $effects = $this->getParsedStringEffects();
@@ -121,6 +196,11 @@ class StyleDefinition {
         return sprintf("\033[%sm", $colors . $effects);
     }
 
+    /**
+     * Parse and return contents between the given XML tag.
+     *
+     * @return string
+     */
     public function getValueBetweenTags(string $tag, string $stringToParse): array<string> {
         $regexp = '#<' . $tag . '>(.*?)</' . $tag . '>#s';
         $valuesMatched = [];
@@ -129,6 +209,13 @@ class StyleDefinition {
         return $valuesMatched[1];
     }
 
+    /**
+     * Return the styled text.
+     *
+     * @param string $text  The text to style
+     *
+     * @return string
+     */
     protected function replaceTagColors(string $text): string {
         return sprintf("%s%s%s", $this->getStartCode(), $text, $this->getEndCode());
     }
diff --git a/src/Titon/Console/System.hh b/src/Titon/Console/System.hh
index d4ddbe0..91301ca 100644
--- a/src/Titon/Console/System.hh
+++ b/src/Titon/Console/System.hh
@@ -7,13 +7,38 @@
 
 namespace Titon\Console;
 
+/**
+ * The `System` class handles operating-specific methods.
+ *
+ * @package Titon\Console
+ */
 interface System {
 
+    /**
+     * Retrieve the height of the current terminal window.
+     *
+     * @return int
+     */
     public function getHeight(): int;
 
+    /**
+     * Retrieve the width of the current terminal window.
+     *
+     * @return int
+     */
     public function getWidth(): int;
 
+    /**
+     * Determine if the current command is piped to another command.
+     *
+     * @return bool
+     */
     public function isPiped(): bool;
 
+    /**
+     * Determine if the current system supports ANSI output.
+     *
+     * @return bool
+     */
     public function supportsAnsi(): bool;
 }
\ No newline at end of file
diff --git a/src/Titon/Console/System/AbstractSystem.hh b/src/Titon/Console/System/AbstractSystem.hh
index a49743c..2282eb9 100644
--- a/src/Titon/Console/System/AbstractSystem.hh
+++ b/src/Titon/Console/System/AbstractSystem.hh
@@ -9,16 +9,40 @@ namespace Titon\Console\System;
 
 use Titon\Console\System;
 
+/**
+ * `Abstractsystem` provides basic functionality for accessing information the
+ * related to the OS application is running on.
+ *
+ * @package Titon\Console\System
+ */
 abstract class AbstractSystem implements System {
 
+    /**
+     * Boolean value if ANSI support should be forced or not.
+     *
+     * @var bool
+     */
     protected bool $forceAnsi = false;
 
+    /**
+     * Set whether ANSI output should be forced or to only output ANSI if the
+     * command line terminal supports it.
+     *
+     * @param bool $force   Force ANSI or not
+     *
+     * @return $this
+     */
     public function forceAnsiSupport(bool $force): this {
         $this->forceAnsi = $force;
 
         return $this;
     }
 
+    /**
+     * Determines if the current command line window supports ANSI output.
+     *
+     * @return bool
+     */
     public function hasAnsiSupport(): bool {
         if ($this->forceAnsi === true) {
             return true;
@@ -27,6 +51,9 @@ abstract class AbstractSystem implements System {
         return $this->supportsAnsi();
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function isPiped(): bool {
         $shellPipe = getenv('SHELL_PIPE');
         if ($shellPipe !== false) {
diff --git a/src/Titon/Console/System/Linux.hh b/src/Titon/Console/System/Linux.hh
index bc5a9a2..ee9008c 100644
--- a/src/Titon/Console/System/Linux.hh
+++ b/src/Titon/Console/System/Linux.hh
@@ -7,16 +7,30 @@
 
 namespace Titon\Console\System;
 
+/**
+ * Linux-specific information.
+ *
+ * @package Titon\Console\System
+ */
 class Linux extends AbstractSystem {
 
+    /**
+     * {@inheritdoc}
+     */
     public function getHeight(): int {
         return (int)exec('tput lines');
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getWidth(): int {
         return (int)exec('tput cols');
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function supportsAnsi(): bool {
         return (function_exists('posix_isatty') && @posix_isatty(STDOUT));
     }
diff --git a/src/Titon/Console/System/SystemFactory.hh b/src/Titon/Console/System/SystemFactory.hh
index 1aa85a8..ee2a16f 100644
--- a/src/Titon/Console/System/SystemFactory.hh
+++ b/src/Titon/Console/System/SystemFactory.hh
@@ -7,8 +7,19 @@
 
 namespace Titon\Console\System;
 
+/**
+ * Factory class for returning the proper `System` based on the operating system
+ * the application is running on.
+ *
+ * @package Titon\Console\System
+ */
 class SystemFactory {
 
+    /**
+     * Return the proper `System` class based on the system's operating system.
+     *
+     * @return \Titon\Console\System\Linux|\Titon\Console\System\Windows
+     */
     public static function factory() {
         if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
             return new Windows();
diff --git a/src/Titon/Console/System/Windows.hh b/src/Titon/Console/System/Windows.hh
index b7967f0..1229639 100644
--- a/src/Titon/Console/System/Windows.hh
+++ b/src/Titon/Console/System/Windows.hh
@@ -7,22 +7,44 @@
 
 namespace Titon\Console\System;
 
+/**
+ * Windows-specific information
+ *
+ * @package Titon\Console\System
+ */
 class Windows extends AbstractSystem {
 
+    /**
+     * Data structure containing the relevant output from the `mode` command.
+     *
+     * @var Vector<string>
+     */
     protected Vector<string> $modeOutput = Vector {};
 
+    /**
+     * {@inheritdoc}
+     */
     public function getHeight(): int {
         $this->getStats();
 
         return (int)$this->modeOutput[0];
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getWidth(): int {
         $this->getStats();
 
         return (int)$this->modeOutput[1];
     }
 
+    /**
+     * Get the width and height of the current terminal window from the `mode`
+     * command.
+     *
+     * @return Vector<string>
+     */
     public function getStats(): Vector<string> {
         if ($this->modeOutput->isEmpty()) {
             $output = '';
@@ -36,6 +58,9 @@ class Windows extends AbstractSystem {
         return $this->modeOutput;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function supportsAnsi(): bool {
         return (getenv('ANSICON') === true || getenv('ConEmuANSI') === 'ON');
     }
diff --git a/src/Titon/Console/UserInput.hh b/src/Titon/Console/UserInput.hh
index 0d1a294..3b0db92 100644
--- a/src/Titon/Console/UserInput.hh
+++ b/src/Titon/Console/UserInput.hh
@@ -7,7 +7,19 @@
 
 namespace Titon\Console;
 
+/**
+ * User input handles presenting a prompt to the user and
+ *
+ * @package Titon\Console
+ */
 interface UserInput {
 
+    /**
+     * Present the user with a prompt and return the inputted value.
+     *
+     * @param string $message   The message to present with the prompt.
+     *
+     * @return mixed
+     */
     public function prompt(string $message): mixed;
 }
\ No newline at end of file
diff --git a/src/Titon/Console/UserInput/AbstractUserInput.hh b/src/Titon/Console/UserInput/AbstractUserInput.hh
index 76bbd55..6231b2a 100644
--- a/src/Titon/Console/UserInput/AbstractUserInput.hh
+++ b/src/Titon/Console/UserInput/AbstractUserInput.hh
@@ -11,29 +11,77 @@ use Titon\Console\Input;
 use Titon\Console\Output;
 use Titon\Console\UserInput;
 
+/**
+ * `AbstractUserInput` handles core functionality for prompting and accepting
+ * the user input.
+ *
+ * @package Titon\Console\UserInput
+ */
 abstract class AbstractUserInput implements UserInput {
 
+    /**
+     * Input values accepted to continue.
+     *
+     * @var Map<mixed, mixed>
+     */
     protected Map<mixed, mixed> $acceptedValues = Map {};
 
+    /**
+     * Default value if input given is empty.
+     *
+     * @var string|null
+     */
     protected ?string $default;
 
+    /**
+     * `Input` object used for retrieving user input.
+     *
+     * @var \Titon\Console\Input
+     */
     protected Input $input;
 
+    /**
+     * `Output` object used for sending output.
+     *
+     * @var \Titon\Console\Output
+     */
     protected Output $output;
 
+    /**
+     * If the input should be accepted strictly or not.
+     *
+     * @var bool
+     */
     protected bool $strict = true;
 
+    /**
+     * Construct a new `UserInput` object.
+     */
     public function __construct() {
-        $this->input = new Input();
-        $this->output = new Output();
+        $this->input = Input::getInstance();
+        $this->output = Output::getInstance();
     }
 
+    /**
+     * Set the default value to use when input is empty.
+     *
+     * @param string $default   The default value
+     *
+     * @return $this
+     */
     public function setDefault(string $default): this {
         $this->default = $default;
 
         return $this;
     }
 
+    /**
+     * Set if the prompt should run in strict mode.
+     *
+     * @param bool $strict  Strict value
+     *
+     * @return $this
+     */
     public function setStrict(bool $strict): this {
         $this->strict = $strict;
 
diff --git a/src/Titon/Console/UserInput/Menu.hh b/src/Titon/Console/UserInput/Menu.hh
index fb8bcb7..da572f8 100644
--- a/src/Titon/Console/UserInput/Menu.hh
+++ b/src/Titon/Console/UserInput/Menu.hh
@@ -9,10 +9,26 @@ namespace Titon\Console\UserInput;
 
 use Titon\Console\Output;
 
+/**
+ * The `Menu` class presents the user with a prompt and a list of available
+ * options to choose from.
+ *
+ * @package Titon\Console\UserInput
+ */
 class Menu extends AbstractUserInput {
 
+    /**
+     * The message to present at the prompt.
+     *
+     * @var string
+     */
     protected string $message;
 
+    /**
+     * Construct a new `Menu` with the available choices.
+     *
+     * @param Map<mixed, mixed> $choices    Available choices accepted
+     */
     public function __construct(Map<mixed, mixed> $choices, string $message = '') {
         parent::__construct();
 
@@ -20,6 +36,9 @@ class Menu extends AbstractUserInput {
         $this->message = $message;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function prompt(string $prompt): mixed {
         $keys = $this->acceptedValues->keys();
         $values = $this->acceptedValues->values();
diff --git a/src/Titon/Console/UserInput/Prompt.hh b/src/Titon/Console/UserInput/Prompt.hh
index af39ccf..731199f 100644
--- a/src/Titon/Console/UserInput/Prompt.hh
+++ b/src/Titon/Console/UserInput/Prompt.hh
@@ -9,10 +9,27 @@ namespace Titon\Console\UserInput;
 
 use Titon\Console\Output;
 
+/**
+ * The `Prompt` class presents the user with a basic prompt and accepts any input
+ * unless predetermined choices are given.
+ *
+ * @package Titon\Console\UserInput
+ */
 class Prompt extends AbstractUserInput {
 
+    /**
+     * If the prompt is set to show value hints, this string contains those hints
+     * to output when presenting the user with the prompt.
+     *
+     * @var string
+     */
     protected string $hint = '';
 
+    /**
+     * Construct a new `Prompt` object with accepted values (if any).
+     *
+     * @param Map<mixed, mixed> $choices    Predetermined accepted choices
+     */
     public function __construct(Map<mixed, mixed> $choices = Map {}, ?string $default = null) {
         parent::__construct();
 
@@ -20,6 +37,9 @@ class Prompt extends AbstractUserInput {
         $this->acceptedValues = $choices;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function prompt(string $message): mixed {
         $keys = $this->acceptedValues->keys();
         $values = $this->acceptedValues->values();
@@ -65,6 +85,14 @@ class Prompt extends AbstractUserInput {
         }
     }
 
+    /**
+     * Set whether the message presented at the prompt should show the predetermined
+     * accepted values (if any).
+     *
+     * @param bool $showHint    Boolean to show the hints or not
+     *
+     * @return $this
+     */
     public function showHints(bool $showHint = true): this {
         if ($showHint === true) {
             $retval = Vector {};
diff --git a/src/Titon/Console/bootstrap.hh b/src/Titon/Console/bootstrap.hh
index abc7c8f..3320938 100644
--- a/src/Titon/Console/bootstrap.hh
+++ b/src/Titon/Console/bootstrap.hh
@@ -15,9 +15,11 @@
 
 namespace Titon\Console {
 
+    type ArgumentList = array<mixed>;
     type RawInput = shape(
         'raw'   => string,
         'value' => string
     );
+    type StyleMap = Map<string, StyleDefinition>;
     type CommandMap = Map<string, Command>;
 }
diff --git a/src/Titon/Console/composer.json b/src/Titon/Console/composer.json
index cf8a5da..f971e13 100644
--- a/src/Titon/Console/composer.json
+++ b/src/Titon/Console/composer.json
@@ -21,7 +21,6 @@
   },
   "require": {
     "hhvm": ">=3.4.0",
-    "titon/common": "*",
     "titon/utility": "*",
   },
   "autoload": {

From ded2d0c6c6b629fcc82f40b5f74c657a57b00881 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Sun, 8 Mar 2015 20:15:47 -0400
Subject: [PATCH 35/92] adjusted test for not initially parsing commands in the
 `parse` method of `Input`

---
 tests/Titon/Console/{ParserTest.hh => ArgumentParserTest.hh} | 3 +++
 1 file changed, 3 insertions(+)
 rename tests/Titon/Console/{ParserTest.hh => ArgumentParserTest.hh} (98%)

diff --git a/tests/Titon/Console/ParserTest.hh b/tests/Titon/Console/ArgumentParserTest.hh
similarity index 98%
rename from tests/Titon/Console/ParserTest.hh
rename to tests/Titon/Console/ArgumentParserTest.hh
index 0255137..0b23708 100644
--- a/tests/Titon/Console/ParserTest.hh
+++ b/tests/Titon/Console/ArgumentParserTest.hh
@@ -137,6 +137,7 @@ class ArgumentParserTest extends TestCase {
             'Alex Phillips',
         ]);
         $this->input->addArgument(new Argument('name'));
+        $this->input->getActiveCommand();
         $this->input->parse();
 
         $this->assertEquals('Alex Phillips', $this->input->getArgument('name')->getValue());
@@ -153,6 +154,8 @@ class ArgumentParserTest extends TestCase {
         $this->input->addOption(new Option('baz'));
         $this->input->addFlag((new Flag('foo'))->alias('f'));
         $this->input->addArgument(new Argument('name'));
+
+        $this->input->getActiveCommand();
         $this->input->parse();
 
         $this->assertEquals('Alex Phillips', $this->input->getArgument('name')->getValue());

From deee5e0552331b3c39775e39dbdff43f52371db9 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Sun, 8 Mar 2015 20:16:04 -0400
Subject: [PATCH 36/92] added more documentation

---
 src/Titon/Console/Input.hh | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/Titon/Console/Input.hh b/src/Titon/Console/Input.hh
index 5f6d57a..f32c16e 100644
--- a/src/Titon/Console/Input.hh
+++ b/src/Titon/Console/Input.hh
@@ -81,6 +81,11 @@ class Input {
      */
     protected InputBag<Option> $options;
 
+    /**
+     * Raw input used at creation of the `Input` object.
+     *
+     * @var array<string>
+     */
     protected array<string> $rawInput;
 
     /**
@@ -182,7 +187,7 @@ class Input {
 
         $input = $this->rawInput;
         foreach ($input as $index => $value) {
-            if ($command = $this->commands[$value]) {
+            if (!is_null($command = $this->commands->get($value))) {
                 $this->command = $command;
                 unset($input[$index]);
                 $this->setInput($input);
@@ -323,12 +328,15 @@ class Input {
             }
 
             if (is_null($this->command)) {
-                if (!is_null($command = $this->commands[$val['value']])) {
+                // If we haven't parsed a command yet, see if we have a match.
+                if (!is_null($command = $this->commands->get($val['value']))) {
                     $this->command = $command;
                     continue;
                 }
             } else {
-                if (!is_null($command = $this->commands[$val['value']])) {
+                // If we have parsed a command and another valid command is present,
+                // throw an exception.
+                if (!is_null($command = $this->commands->get($val['value'])) && $command->getName() !== $this->command->getName()) {
                     throw new InvalidNumberOfCommandsException("Multiple commands are not supported.");
                 }
             }
@@ -442,7 +450,9 @@ class Input {
      * @return $this
      */
     public function setInput(array<string> $args): this {
+        $this->rawInput = $args;
         $this->input = new InputLexer($args);
+        $this->command = null;
 
         return $this;
     }

From e9229e269b15bc94015e3e8c8a21a8e8be7c02a9 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Mon, 9 Mar 2015 17:24:51 -0400
Subject: [PATCH 37/92] removed unnecessary EmptyCommandStub test class

---
 tests/Titon/Console/ArgumentParserTest.hh       |  3 +--
 tests/Titon/Test/Stub/Console/CommandStub.hh    |  4 +++-
 .../Titon/Test/Stub/Console/EmptyCommandStub.hh | 17 -----------------
 3 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 tests/Titon/Test/Stub/Console/EmptyCommandStub.hh

diff --git a/tests/Titon/Console/ArgumentParserTest.hh b/tests/Titon/Console/ArgumentParserTest.hh
index 0b23708..076fa83 100644
--- a/tests/Titon/Console/ArgumentParserTest.hh
+++ b/tests/Titon/Console/ArgumentParserTest.hh
@@ -3,7 +3,6 @@
 namespace Titon\Console;
 
 use Titon\Test\Stub\Console\CommandStub;
-use Titon\Test\Stub\Console\EmptyCommandStub;
 use Titon\Test\TestCase;
 use Titon\Console\InputDefinition\Flag;
 use Titon\Console\InputDefinition\Option;
@@ -16,7 +15,7 @@ class ArgumentParserTest extends TestCase {
 
     public function setUp() {
         $this->input = new Input();
-        $this->input->addCommand(new EmptyCommandStub());
+        $this->input->addCommand(new CommandStub());
     }
 
     public function testParseFlags(): void {
diff --git a/tests/Titon/Test/Stub/Console/CommandStub.hh b/tests/Titon/Test/Stub/Console/CommandStub.hh
index 484434e..ed58b8f 100644
--- a/tests/Titon/Test/Stub/Console/CommandStub.hh
+++ b/tests/Titon/Test/Stub/Console/CommandStub.hh
@@ -8,7 +8,9 @@ use Titon\Console\InputDefinition\Flag;
 class CommandStub extends AbstractCommand {
 
     public function configure() {
-        $this->addFlag((new Flag('verbose', 'Set command verbosity'))->alias('v'));
+        $this->setName('command');
+        $this->addFlag((new Flag('verbose', 'Set command verbosity'))
+            ->alias('v'));
     }
 
     public function run() {
diff --git a/tests/Titon/Test/Stub/Console/EmptyCommandStub.hh b/tests/Titon/Test/Stub/Console/EmptyCommandStub.hh
deleted file mode 100644
index 2297ad1..0000000
--- a/tests/Titon/Test/Stub/Console/EmptyCommandStub.hh
+++ /dev/null
@@ -1,17 +0,0 @@
-<?hh // strict
-
-namespace Titon\Test\Stub\Console;
-
-use Titon\Console\Command\AbstractCommand;
-use Titon\Console\InputDefinition\Flag;
-
-class EmptyCommandStub extends AbstractCommand {
-
-    public function configure() {
-        $this->setName('command');
-    }
-
-    public function run() {
-
-    }
-}
\ No newline at end of file

From eaf4696fa1f1a70dca3f23b5524c1a705af70137 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Mon, 9 Mar 2015 17:25:14 -0400
Subject: [PATCH 38/92] added bootstrapping flags, cleaned up output of
 available commands in help screen

---
 src/Titon/Console/HelpScreen.hh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Titon/Console/HelpScreen.hh b/src/Titon/Console/HelpScreen.hh
index ff78898..1bf6076 100644
--- a/src/Titon/Console/HelpScreen.hh
+++ b/src/Titon/Console/HelpScreen.hh
@@ -85,7 +85,9 @@ class HelpScreen {
     public function render(): string {
         $retval = Vector {};
 
-        $retval[] = $this->renderHeading();
+        if ($heading = $this->renderHeading()) {
+            $retval[] = $this->renderHeading();
+        }
         $retval[] = $this->renderUsage();
 
         if (!$this->arguments->all()->isEmpty()) {
@@ -145,7 +147,7 @@ class HelpScreen {
                         // actually a command, so subtract substr_count by 1.
                         $nestedNames[] = $nest;
 
-                        $indentation = substr_count($name, ':') - 1;
+                        $indentation = substr_count($name, ':');
                         $output[] = str_repeat('  ', $indentation) . str_pad($nest, $maxLength);
                     }
                 }
@@ -164,7 +166,7 @@ class HelpScreen {
                 $formatted .= "\n$pad$desc";
             }
 
-            $formatted = "$formatted";
+            $formatted = "  $formatted";
 
             array_push($output, $formatted);
         }

From 33e1b088db76f64281153d7246443c56a45ec044 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Mon, 9 Mar 2015 17:55:40 -0400
Subject: [PATCH 39/92] fixed type check errors, changed arguments parsed in
 Input class to a Vector

---
 src/Titon/Console/Command.hh                  | 19 ++++++
 src/Titon/Console/Command/AbstractCommand.hh  | 12 +---
 src/Titon/Console/Console.hh                  | 40 ++++++++++-
 .../Console/Feedback/AbstractFeedback.hh      | 17 +++--
 src/Titon/Console/Feedback/ProgressBar.hh     |  2 +
 src/Titon/Console/Input.hh                    | 24 +++----
 src/Titon/Console/InputLexer.hh               |  6 +-
 src/Titon/Console/Output.hh                   |  6 +-
 tests/Titon/Console/ArgumentParserTest.hh     | 66 +++++++++----------
 tests/Titon/Console/CommandTest.hh            |  4 +-
 10 files changed, 122 insertions(+), 74 deletions(-)

diff --git a/src/Titon/Console/Command.hh b/src/Titon/Console/Command.hh
index 337b929..ab05d2d 100644
--- a/src/Titon/Console/Command.hh
+++ b/src/Titon/Console/Command.hh
@@ -10,6 +10,7 @@ namespace Titon\Console;
 use Titon\Console\InputDefinition\Argument;
 use Titon\Console\InputDefinition\Flag;
 use Titon\Console\InputDefinition\Option;
+use Titon\Console\Input;
 
 /**
  * A `Command` is a user-defined class that can to register user input and run
@@ -63,10 +64,28 @@ interface Command {
      */
     public function getOptions(): InputBag<Option>;
 
+    /**
+     * This method prepares the command for execution by registering all of its
+     * command-specific argumenets, flags, and options with the `Input` before
+     * parsing.
+     *
+     * @return $this
+     */
+    public function registerInput(): this;
+
     /**
      * The method that stores the code to be executed when the `Command` is run.
      *
      * @return void
      */
     public function run(): void;
+
+    /**
+     * Set the `Input` objet for the commandd.
+     *
+     * @param \Titon\Console\Input $input The `Input` object
+     *
+     * @return $this
+     */
+    public function setInput(Input $input): this;
 }
\ No newline at end of file
diff --git a/src/Titon/Console/Command/AbstractCommand.hh b/src/Titon/Console/Command/AbstractCommand.hh
index 24d797b..bfb85cb 100644
--- a/src/Titon/Console/Command/AbstractCommand.hh
+++ b/src/Titon/Console/Command/AbstractCommand.hh
@@ -210,11 +210,7 @@ abstract class AbstractCommand implements Command {
     }
 
     /**
-     * This method prepares the command for execution by registering all of its
-     * command-specific argumenets, flags, and options with the `Input` before
-     * parsing.
-     *
-     * @return $this
+     * {@inheritdoc}
      */
     public function registerInput(): this {
         foreach ($this->arguments as $name => $argument) {
@@ -244,11 +240,7 @@ abstract class AbstractCommand implements Command {
     }
 
     /**
-     * Set the `Input` objet for the commandd.
-     *
-     * @param \Titon\Console\Input $input The `Input` object
-     *
-     * @return $this
+     * {@inheritdoc}
      */
     public function setInput(Input $input): this {
         $this->input = $input;
diff --git a/src/Titon/Console/Console.hh b/src/Titon/Console/Console.hh
index 18c5124..c2e7a3f 100644
--- a/src/Titon/Console/Console.hh
+++ b/src/Titon/Console/Console.hh
@@ -69,7 +69,13 @@ class Console {
      * settings.
      */
     protected function bootstrap(): void {
-        $this->input->addFlag((new Flag('help', 'Display this help screen.'))->alias('h'));
+        $this->input->addFlag((new Flag('help', 'Display this help screen.'))
+            ->alias('h'));
+        $this->input->addFlag((new Flag('quiet', 'Suppress all output.'))
+            ->alias('q'));
+        $this->input->addFlag((new Flag('verbose', 'Set the verbosity of the application\'s output.'))
+            ->alias('v')
+            ->setStackable(true));
     }
 
     /**
@@ -95,9 +101,37 @@ class Console {
         $command->registerInput();
         $this->input->parse();
 
-        if (!is_null($this->input->getFlag('help')) && $this->input->getFlag('help')->getValue() === 1) {
-            $this->renderHelpScreen($command);
+        if (!is_null($flag = $this->input->getFlag('help'))) {
+            invariant($flag instanceof Flag, "Must be a Flag.");
+
+            if ($flag->getValue() === 1) {
+                $this->renderHelpScreen($command);
+            }
         } else {
+            $flag = $this->input->getFlag('quiet');
+
+            $verbositySet = false;
+            if (!is_null($flag)) {
+                invariant($flag instanceof Flag, "Must be a Flag.");
+
+                if (!is_null($verbosity = (int)$flag->getValue())) {
+                    $verbositySet = true;
+                    $this->output->setVerbosity($verbosity);
+                }
+            }
+
+            if ($verbositySet === false) {
+                $flag = $this->input->getFlag('verbose');
+
+                if (!is_null($flag)) {
+                    invariant($flag instanceof Flag, "Must be a Flag.");
+
+                    if (!is_null($verbosity = (int)$flag->getValue())) {
+                        $this->output->setVerbosity($verbosity);
+                    }
+                }
+            }
+
             $command->run();
         }
     }
diff --git a/src/Titon/Console/Feedback/AbstractFeedback.hh b/src/Titon/Console/Feedback/AbstractFeedback.hh
index a645996..29d428a 100644
--- a/src/Titon/Console/Feedback/AbstractFeedback.hh
+++ b/src/Titon/Console/Feedback/AbstractFeedback.hh
@@ -23,7 +23,7 @@ abstract class AbstractFeedback implements Feedback {
      *
      * @var string
      */
-    protected Vector<string> $characterSequence;
+    protected Vector<string> $characterSequence = Vector {};
 
     /**
      * The current cycle out of the given total.
@@ -44,7 +44,7 @@ abstract class AbstractFeedback implements Feedback {
      *
      * @var int
      */
-    protected int $interation = 0;
+    protected int $iteration = 0;
 
     /**
      * The interval (in miliseconds) between updates of the indicator.
@@ -240,11 +240,13 @@ abstract class AbstractFeedback implements Feedback {
      * @var int
      */
     protected function getElapsedTime(): int {
-        if (is_null($this->start)) {
+        if (is_null($start = $this->start)) {
             return 0;
         }
 
-        return (time() - $this->start);
+        invariant(!is_null($start), "Must not be null.");
+
+        return (time() - $start);
     }
 
     /**
@@ -271,12 +273,15 @@ abstract class AbstractFeedback implements Feedback {
             return 0.0;
         }
 
-        if (is_null($this->tick)) {
+        if (is_null($tick = $this->tick)) {
             $this->tick = $this->start;
+            $tick = $this->tick;
         }
 
+        invariant(!is_null($tick), "Must not be null.");
+
         $now = microtime(true);
-        $span = $now - $this->tick;
+        $span = $now - $tick;
         if ($span > 1) {
             $this->iteration++;
             $this->tick = $now;
diff --git a/src/Titon/Console/Feedback/ProgressBar.hh b/src/Titon/Console/Feedback/ProgressBar.hh
index 04dae02..10e164a 100644
--- a/src/Titon/Console/Feedback/ProgressBar.hh
+++ b/src/Titon/Console/Feedback/ProgressBar.hh
@@ -79,5 +79,7 @@ class ProgressBar extends AbstractFeedback {
         }
 
         parent::setCharacterSequence($characters);
+
+        return $this;
     }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/Input.hh b/src/Titon/Console/Input.hh
index f32c16e..32cc5c7 100644
--- a/src/Titon/Console/Input.hh
+++ b/src/Titon/Console/Input.hh
@@ -84,9 +84,9 @@ class Input {
     /**
      * Raw input used at creation of the `Input` object.
      *
-     * @var array<string>
+     * @var Vector<string>
      */
-    protected array<string> $rawInput;
+    protected Vector<string> $rawInput;
 
     /**
      * Stream handle for user input.
@@ -106,11 +106,11 @@ class Input {
     /**
      * Construct a new instance of Input
      *
-     * @param array<mixed>|null $args
+     * @param Vector<string>|null $args
      */
-    public function __construct(?array<string> $args = null, bool $strict = false) {
+    public function __construct(?Vector<string> $args = null, bool $strict = false) {
         if (is_null($args)) {
-            $args = array_slice(Server::get('argv'), 1);
+            $args = new Vector(array_slice(Server::get('argv'), 1));
         }
 
         $this->rawInput = $args;
@@ -185,11 +185,11 @@ class Input {
             return $this->command;
         }
 
-        $input = $this->rawInput;
+        $input = new Vector($this->rawInput);
         foreach ($input as $index => $value) {
             if (!is_null($command = $this->commands->get($value))) {
                 $this->command = $command;
-                unset($input[$index]);
+                $input->removeKey($index);
                 $this->setInput($input);
 
                 return $this->command;
@@ -334,11 +334,7 @@ class Input {
                     continue;
                 }
             } else {
-                // If we have parsed a command and another valid command is present,
-                // throw an exception.
-                if (!is_null($command = $this->commands->get($val['value'])) && $command->getName() !== $this->command->getName()) {
-                    throw new InvalidNumberOfCommandsException("Multiple commands are not supported.");
-                }
+                throw new InvalidNumberOfCommandsException("Multiple commands are not supported.");
             }
 
             $this->invalid[] = $val;
@@ -445,11 +441,11 @@ class Input {
     /**
      * Set the input to be parsed.
      *
-     * @param array<string> $args   The input to be parsed
+     * @param Vector<string> $args   The input to be parsed
      *
      * @return $this
      */
-    public function setInput(array<string> $args): this {
+    public function setInput(Vector<string> $args): this {
         $this->rawInput = $args;
         $this->input = new InputLexer($args);
         $this->command = null;
diff --git a/src/Titon/Console/InputLexer.hh b/src/Titon/Console/InputLexer.hh
index 70d6e83..2035a01 100644
--- a/src/Titon/Console/InputLexer.hh
+++ b/src/Titon/Console/InputLexer.hh
@@ -21,7 +21,7 @@ class InputLexer implements Iterator<RawInput> {
      *
      * @var array<string>
      */
-    public array<string> $items;
+    public Vector<string> $items;
 
     /**
      * The current position in the `items` of the lexer.
@@ -56,9 +56,9 @@ class InputLexer implements Iterator<RawInput> {
      *
      * @param array<string> $items  The items to traverse through
      */
-    public function __construct(array<string> $items) {
+    public function __construct(Vector<string> $items) {
         $this->items = $items;
-        $this->length = count($items);
+        $this->length = $items->count();
         $this->current = shape(
             'value' => '',
             'raw'   => ''
diff --git a/src/Titon/Console/Output.hh b/src/Titon/Console/Output.hh
index e9c1de5..d139efc 100644
--- a/src/Titon/Console/Output.hh
+++ b/src/Titon/Console/Output.hh
@@ -56,7 +56,7 @@ class Output {
      *
      * @var int
      */
-    protected int $systemVerbosity;
+    protected int $verbosity;
 
     /**
      * Construct a new `Output` object.
@@ -66,7 +66,7 @@ class Output {
     public function __construct(int $verbosity = self::VERBOSITY_NORMAL) {
         $this->stderr = fopen(Output::STREAM_STDERR, 'w');
         $this->stdout = fopen(Output::STREAM_STDOUT, 'w');
-        $this->systemVerbosity = $verbosity;
+        $this->verbosity = $verbosity;
 
         if (is_null(self::$instance)) {
             self::$instance = $this;
@@ -205,7 +205,7 @@ class Output {
      * @return bool
      */
     protected function shouldOutput(int $verbosity): bool {
-        if ($verbosity <= $this->systemVerbosity) {
+        if ($verbosity <= $this->verbosity) {
             return true;
         }
 
diff --git a/tests/Titon/Console/ArgumentParserTest.hh b/tests/Titon/Console/ArgumentParserTest.hh
index 076fa83..fe84b75 100644
--- a/tests/Titon/Console/ArgumentParserTest.hh
+++ b/tests/Titon/Console/ArgumentParserTest.hh
@@ -22,20 +22,20 @@ class ArgumentParserTest extends TestCase {
         /*
          * Check basic flag
          */
-        $this->input->setInput([
+        $this->input->setInput(Vector {
             'command',
-            '--foo',
-        ]);
+            '--foo'
+        });
         $this->input->addFlag((new Flag('foo'))->alias('f'));
         $this->input->parse();
 
         $this->assertEquals(1, $this->input->getFlag('foo')->getValue());
         $this->assertEquals(1, $this->input->getFlag('f')->getValue());
 
-        $this->input->setInput([
+        $this->input->setInput(Vector {
             'command',
-            '-f',
-        ]);
+            '-f'
+        });
         $this->input->addFlag((new Flag('foo'))->alias('f'));
         $this->input->parse();
 
@@ -45,10 +45,10 @@ class ArgumentParserTest extends TestCase {
         /*
          * Check stacked, but different, flags
          */
-        $this->input->setInput([
+        $this->input->setInput(Vector {
             'command',
-            '-fb',
-        ]);
+            '-fb'
+        });
         $this->input->addFlag((new Flag('foo'))->alias('f'));
         $this->input->addFlag((new Flag('bar'))->alias('b'));
         $this->input->parse();
@@ -59,10 +59,10 @@ class ArgumentParserTest extends TestCase {
         /*
          * Check stacked flag
          */
-        $this->input->SetInput([
+        $this->input->SetInput(Vector {
             'command',
-            '-vvv',
-        ]);
+            '-vvv'
+        });
         $this->input->addFlag((new Flag('v'))->setStackable(true));
         $this->input->parse();
 
@@ -71,9 +71,9 @@ class ArgumentParserTest extends TestCase {
         /*
          * Check inverse flags
          */
-        $this->input->setInput([
-            '--no-foo',
-        ]);
+        $this->input->setInput(Vector {
+            '--no-foo'
+        });
 
         $this->input->addFlag(new Flag('foo'));
         $this->input->parse();
@@ -82,11 +82,11 @@ class ArgumentParserTest extends TestCase {
     }
 
     public function testParseOptions(): void {
-        $this->input->setInput([
+        $this->input->setInput(Vector {
             'command',
             '--name',
-            'Alex Phillips',
-        ]);
+            'Alex Phillips'
+        });
         $this->input->addOption((new Option('name'))->alias('n'));
         $this->input->addArgument(new Argument('bar', 'Bar!'));
         $this->input->parse();
@@ -94,11 +94,11 @@ class ArgumentParserTest extends TestCase {
         $this->assertEquals('Alex Phillips', $this->input->getOption('name')->getValue());
         $this->assertEquals('Alex Phillips', $this->input->getOption('n')->getValue());
 
-        $this->input->setInput([
+        $this->input->setInput(Vector {
             '--name',
             'Alex Phillips',
-            'command',
-        ]);
+            'command'
+        });
         $this->input->addOption((new Option('name'))->alias('n'));
         $this->input->addArgument(new Argument('bar', 'Bar!'));
         $this->input->parse();
@@ -106,11 +106,11 @@ class ArgumentParserTest extends TestCase {
         $this->assertEquals('Alex Phillips', $this->input->getOption('name')->getValue());
         $this->assertEquals('Alex Phillips', $this->input->getOption('n')->getValue());
 
-        $this->input->setInput([
+        $this->input->setInput(Vector {
             'command',
             '-n',
-            'Alex Phillips',
-        ]);
+            'Alex Phillips'
+        });
         $this->input->addOption((new Option('name'))->alias('n'));
         $this->input->addArgument(new Argument('bar', 'Bar!'));
         $this->input->parse();
@@ -118,10 +118,10 @@ class ArgumentParserTest extends TestCase {
         $this->assertEquals('Alex Phillips', $this->input->getOption('name')->getValue());
         $this->assertEquals('Alex Phillips', $this->input->getOption('n')->getValue());
 
-        $this->input->setInput([
+        $this->input->setInput(Vector {
             'command',
-            '--name="Alex Phillips"',
-        ]);
+            '--name="Alex Phillips"'
+        });
         $this->input->addOption((new Option('name'))->alias('n'));
         $this->input->addArgument(new Argument('bar', 'Bar!'));
         $this->input->parse();
@@ -131,10 +131,10 @@ class ArgumentParserTest extends TestCase {
     }
 
     public function testParseArguments(): void {
-        $this->input->setInput([
+        $this->input->setInput(Vector {
             'command',
-            'Alex Phillips',
-        ]);
+            'Alex Phillips'
+        });
         $this->input->addArgument(new Argument('name'));
         $this->input->getActiveCommand();
         $this->input->parse();
@@ -143,12 +143,12 @@ class ArgumentParserTest extends TestCase {
     }
 
     public function testMixedArguments(): void {
-        $this->input->setInput([
+        $this->input->setInput(Vector {
             'command',
             'Alex Phillips',
             '-fb',
-            '--baz="woot"',
-        ]);
+            '--baz="woot"'
+        });
         $this->input->addFlag((new Flag('bar'))->alias('b'));
         $this->input->addOption(new Option('baz'));
         $this->input->addFlag((new Flag('foo'))->alias('f'));
diff --git a/tests/Titon/Console/CommandTest.hh b/tests/Titon/Console/CommandTest.hh
index 17d5a22..2bbcb34 100644
--- a/tests/Titon/Console/CommandTest.hh
+++ b/tests/Titon/Console/CommandTest.hh
@@ -11,9 +11,9 @@ use Titon\Console\InputDefinition\Argument;
 class CommandTest extends TestCase {
 
     public function testAddArguments(): void {
-        $args = new Input([
+        $args = new Input(Vector {
             '-v'
-        ]);
+        });
         $args->addFlag(new Flag('help', 'Show this help screen'));
 
         $command = new CommandStub();

From d27865575fd904e93b117130b640993dc821cdd1 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Mon, 9 Mar 2015 18:19:38 -0400
Subject: [PATCH 40/92] added missing docs, fixed type check errors

---
 src/Titon/Console/Command/AbstractCommand.hh | 5 +++++
 src/Titon/Console/Feedback/ProgressBar.hh    | 1 +
 src/Titon/Console/Table/AsciiTable.hh        | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Titon/Console/Command/AbstractCommand.hh b/src/Titon/Console/Command/AbstractCommand.hh
index bfb85cb..95d0999 100644
--- a/src/Titon/Console/Command/AbstractCommand.hh
+++ b/src/Titon/Console/Command/AbstractCommand.hh
@@ -66,6 +66,11 @@ abstract class AbstractCommand implements Command {
      */
     protected InputBag<Option> $options;
 
+    /**
+     * The `Output` object to handle output to the user.
+     *
+     * @var \Titon\Console\Output
+     */
     protected Output $output;
 
     /**
diff --git a/src/Titon/Console/Feedback/ProgressBar.hh b/src/Titon/Console/Feedback/ProgressBar.hh
index 10e164a..be1dd85 100644
--- a/src/Titon/Console/Feedback/ProgressBar.hh
+++ b/src/Titon/Console/Feedback/ProgressBar.hh
@@ -9,6 +9,7 @@ namespace Titon\Console\Feedback;
 
 use Titon\Console\Output;
 use Titon\Console\System\SystemFactory;
+use Titon\Console\Exception\InvalidCharacterSequence;
 
 /**
  * The `ProgressBar` class displays feedback information with a progress bar.
diff --git a/src/Titon/Console/Table/AsciiTable.hh b/src/Titon/Console/Table/AsciiTable.hh
index 6b6099e..ece388c 100644
--- a/src/Titon/Console/Table/AsciiTable.hh
+++ b/src/Titon/Console/Table/AsciiTable.hh
@@ -113,7 +113,7 @@ class AsciiTable extends AbstractTable {
     protected function getRowWidth(): int {
         if (is_null($this->rowWidth)) {
             if (!is_null($this->rows[0])) {
-                $this->rowWidth = strlen($this->buildRow($row));
+                $this->rowWidth = strlen($this->buildRow($this->rows[0]));
             }
         }
 

From 10b4bd4b4f1a45490ea1d90c855ffa7f52d21b7a Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Mon, 9 Mar 2015 18:53:11 -0400
Subject: [PATCH 41/92] abstracted 'type' using generics of input definitions

---
 .../AbstractInputDefinition.hh                | 40 +++++++++++++++----
 src/Titon/Console/InputDefinition/Argument.hh | 15 +------
 src/Titon/Console/InputDefinition/Flag.hh     | 28 +------------
 src/Titon/Console/InputDefinition/Option.hh   | 27 +------------
 4 files changed, 36 insertions(+), 74 deletions(-)

diff --git a/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh b/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
index b014792..9d6a26d 100644
--- a/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
+++ b/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
@@ -15,7 +15,7 @@ use Titon\Console\InputDefinition;
  *
  * @package Titon\Console\InputDefinition
  */
-abstract class AbstractInputDefinition implements InputDefinition {
+abstract class AbstractInputDefinition<T> implements InputDefinition {
 
     const int MODE_OPTIONAL = 0;
     const int MODE_REQUIRED = 1;
@@ -30,9 +30,9 @@ abstract class AbstractInputDefinition implements InputDefinition {
     /**
      * The default value given to the input if not specified by the user.
      *
-     * @var mixed
+     * @var T|null
      */
-    protected mixed $default;
+    protected ?T $default;
 
     /**
      * The description of the input.
@@ -58,9 +58,9 @@ abstract class AbstractInputDefinition implements InputDefinition {
     /**
      * The value the user has given the input.
      *
-     * @var mixed
+     * @var T|null
      */
-    protected mixed $value;
+    protected ?T $value;
 
     /**
      * Cosntruct a new instance of an `InputDefinition`.
@@ -109,7 +109,7 @@ abstract class AbstractInputDefinition implements InputDefinition {
      *
      * @return mixed
      */
-    public function getDefault(): mixed {
+    public function getDefault(): ?T {
         return $this->default;
     }
 
@@ -161,7 +161,7 @@ abstract class AbstractInputDefinition implements InputDefinition {
      *
      * @return mixed
      */
-    public function getValue(): mixed {
+    public function getValue(): ?T {
         if (!is_null($this->value)) {
             return $this->value;
         }
@@ -186,4 +186,30 @@ abstract class AbstractInputDefinition implements InputDefinition {
 
         return $this;
     }
+
+    /**
+     * Set the default value for the `Flag` if no value is give.
+     *
+     * @param int $default  The default value
+     *
+     * @return $this
+     */
+    public function setDefault(T $default): this {
+        $this->default = $default;
+
+        return $this;
+    }
+
+    /**
+     * Set the value of the `Flag`.
+     *
+     * @param int $value The value given to the `Flag`
+     *
+     * @return $this
+     */
+    public function setValue(T $value): this {
+        $this->value = $value;
+
+        return $this;
+    }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/InputDefinition/Argument.hh b/src/Titon/Console/InputDefinition/Argument.hh
index 3de20e2..daed912 100644
--- a/src/Titon/Console/InputDefinition/Argument.hh
+++ b/src/Titon/Console/InputDefinition/Argument.hh
@@ -13,7 +13,7 @@ namespace Titon\Console\InputDefinition;
  *
  * @package Titon\Console\InputDefinition
  */
-class Argument extends AbstractInputDefinition {
+class Argument extends AbstractInputDefinition<string> {
 
     /**
      * {@inheritdoc}
@@ -22,17 +22,4 @@ class Argument extends AbstractInputDefinition {
     public function getFormattedName(string $name): string {
         return $name;
     }
-
-    /**
-     * Set the value of the `Argument`.
-     *
-     * @param string $value The value given to the `Argument`
-     *
-     * @return $this
-     */
-    public function setValue(string $value): this {
-        $this->value = $value;
-
-        return $this;
-    }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/InputDefinition/Flag.hh b/src/Titon/Console/InputDefinition/Flag.hh
index 2936e72..f48cb56 100644
--- a/src/Titon/Console/InputDefinition/Flag.hh
+++ b/src/Titon/Console/InputDefinition/Flag.hh
@@ -12,7 +12,7 @@ namespace Titon\Console\InputDefinition;
  *
  * @package Titon\Console\InputDefinition
  */
-class Flag extends AbstractInputDefinition {
+class Flag extends AbstractInputDefinition<int> {
 
     /**
      * The negative alias of the `Flag` (i.e., --no-foo for -foo). A negative
@@ -105,19 +105,6 @@ class Flag extends AbstractInputDefinition {
         return $this;
     }
 
-    /**
-     * Set the default value for the `Flag` if no value is give.
-     *
-     * @param int $default  The default value
-     *
-     * @return $this
-     */
-    public function setDefault(int $default): this {
-        $this->default = $default;
-
-        return $this;
-    }
-
     /**
      * Set whether the `Flag` is stackable or not.
      *
@@ -130,17 +117,4 @@ class Flag extends AbstractInputDefinition {
 
         return $this;
     }
-
-    /**
-     * Set the value of the `Flag`.
-     *
-     * @param int $value The value given to the `Flag`
-     *
-     * @return $this
-     */
-    public function setValue(int $value): this {
-        $this->value = $value;
-
-        return $this;
-    }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/InputDefinition/Option.hh b/src/Titon/Console/InputDefinition/Option.hh
index 6a3590c..6b682be 100644
--- a/src/Titon/Console/InputDefinition/Option.hh
+++ b/src/Titon/Console/InputDefinition/Option.hh
@@ -12,31 +12,6 @@ namespace Titon\Console\InputDefinition;
  *
  * @package Titon\Console\InputDefinition
  */
-class Option extends AbstractInputDefinition {
+class Option extends AbstractInputDefinition<string> {
 
-    /**
-     * Set the default value for the `Option` if no value is give.
-     *
-     * @param int $default  The default value
-     *
-     * @return $this
-     */
-    public function setDefault(string $default): this {
-        $this->default = $default;
-
-        return $this;
-    }
-
-    /**
-     * Set the value of the `Option`.
-     *
-     * @param string $value The value given to the `Option`
-     *
-     * @return $this
-     */
-    public function setValue(string $value): this {
-        $this->value = $value;
-
-        return $this;
-    }
 }
\ No newline at end of file

From b6a28a8aeaa3339b67e6f7acd9f3b7c0096c298f Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Mon, 9 Mar 2015 18:53:45 -0400
Subject: [PATCH 42/92] fixed typo

---
 src/Titon/Console/InputDefinition/Option.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Titon/Console/InputDefinition/Option.hh b/src/Titon/Console/InputDefinition/Option.hh
index 6b682be..9af5c9d 100644
--- a/src/Titon/Console/InputDefinition/Option.hh
+++ b/src/Titon/Console/InputDefinition/Option.hh
@@ -8,7 +8,7 @@
 namespace Titon\Console\InputDefinition;
 
 /**
- * A `Flag` is a value parameter specified by a user.
+ * An `Option` is a value parameter specified by a user.
  *
  * @package Titon\Console\InputDefinition
  */

From c4d352d29c2c2c42af8fee249e40078c2aea308a Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Mon, 9 Mar 2015 19:43:37 -0400
Subject: [PATCH 43/92] initial commit

---
 .../Exception/InvalidNumberOfArguments.hh     | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 src/Titon/Console/Exception/InvalidNumberOfArguments.hh

diff --git a/src/Titon/Console/Exception/InvalidNumberOfArguments.hh b/src/Titon/Console/Exception/InvalidNumberOfArguments.hh
new file mode 100644
index 0000000..e80e603
--- /dev/null
+++ b/src/Titon/Console/Exception/InvalidNumberOfArguments.hh
@@ -0,0 +1,20 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\Exception;
+
+use RuntimeException;
+
+/**
+ * Exception thrown when parameters are passed in the input that do not belong
+ * to registered input definitions.
+ *
+ * @package Titon\Context\Exception
+ */
+class InvalidNumberOfCommandsException extends RuntimeException {
+
+}

From 410724ed4794f4358204cd5572222c71aed0d755 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Mon, 9 Mar 2015 20:50:31 -0400
Subject: [PATCH 44/92] fixed incorrect package name (copypasta error!)

---
 src/Titon/Console/Exception/InvalidCharacterSequence.hh         | 2 +-
 src/Titon/Console/Exception/InvalidCommandException.hh          | 2 +-
 src/Titon/Console/Exception/InvalidNumberOfArguments.hh         | 2 +-
 src/Titon/Console/Exception/InvalidNumberOfCommandsException.hh | 2 +-
 src/Titon/Console/Exception/MissingValueException.hh            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Titon/Console/Exception/InvalidCharacterSequence.hh b/src/Titon/Console/Exception/InvalidCharacterSequence.hh
index c02f201..1c2f2ca 100644
--- a/src/Titon/Console/Exception/InvalidCharacterSequence.hh
+++ b/src/Titon/Console/Exception/InvalidCharacterSequence.hh
@@ -13,7 +13,7 @@ use RuntimeException;
  * Exception thrown when an invalid character sequence is used in a `Feedback`
  * class.
  *
- * @package Titon\Context\Exception
+ * @package Titon\Console\Exception
  */
 class InvalidCharacterSequence extends RuntimeException {
 
diff --git a/src/Titon/Console/Exception/InvalidCommandException.hh b/src/Titon/Console/Exception/InvalidCommandException.hh
index 18ccf85..96032a8 100644
--- a/src/Titon/Console/Exception/InvalidCommandException.hh
+++ b/src/Titon/Console/Exception/InvalidCommandException.hh
@@ -12,7 +12,7 @@ use RuntimeException;
 /**
  * Exception thrown when the command used in the application doesn't exist.
  *
- * @package Titon\Context\Exception
+ * @package Titon\Console\Exception
  */
 class InvalidCommandException extends RuntimeException {
 
diff --git a/src/Titon/Console/Exception/InvalidNumberOfArguments.hh b/src/Titon/Console/Exception/InvalidNumberOfArguments.hh
index e80e603..782525b 100644
--- a/src/Titon/Console/Exception/InvalidNumberOfArguments.hh
+++ b/src/Titon/Console/Exception/InvalidNumberOfArguments.hh
@@ -13,7 +13,7 @@ use RuntimeException;
  * Exception thrown when parameters are passed in the input that do not belong
  * to registered input definitions.
  *
- * @package Titon\Context\Exception
+ * @package Titon\Console\Exception
  */
 class InvalidNumberOfCommandsException extends RuntimeException {
 
diff --git a/src/Titon/Console/Exception/InvalidNumberOfCommandsException.hh b/src/Titon/Console/Exception/InvalidNumberOfCommandsException.hh
index 60c2b9f..dc1ac53 100644
--- a/src/Titon/Console/Exception/InvalidNumberOfCommandsException.hh
+++ b/src/Titon/Console/Exception/InvalidNumberOfCommandsException.hh
@@ -13,7 +13,7 @@ use RuntimeException;
  * Exception thrown when an invalid number of commands is passed into the
  * application.
  *
- * @package Titon\Context\Exception
+ * @package Titon\Console\Exception
  */
 class InvalidNumberOfCommandsException extends RuntimeException {
 
diff --git a/src/Titon/Console/Exception/MissingValueException.hh b/src/Titon/Console/Exception/MissingValueException.hh
index 44eedc2..e842742 100644
--- a/src/Titon/Console/Exception/MissingValueException.hh
+++ b/src/Titon/Console/Exception/MissingValueException.hh
@@ -13,7 +13,7 @@ use RuntimeException;
  * Exception thrown when a value is required and not present. This can be the
  * case with options or arguments.
  *
- * @package Titon\Context\Exception
+ * @package Titon\Console\Exception
  */
 class MissingValueException extends RuntimeException {
 

From 2c45d92ff0d8f744cbfee57f197a0421ac70b5c7 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Mon, 9 Mar 2015 21:22:36 -0400
Subject: [PATCH 45/92] fixed issues per PR

---
 src/Titon/Console/Command.hh                  | 14 ++++-
 src/Titon/Console/Command/AbstractCommand.hh  | 31 +++++++++-
 src/Titon/Console/Console.hh                  | 16 +++--
 .../Console/Feedback/AbstractFeedback.hh      | 39 ++++++------
 src/Titon/Console/HelpScreen.hh               | 20 ++++---
 src/Titon/Console/Input.hh                    | 59 ++++++++++++++++++-
 src/Titon/Console/InputDefinition/Flag.hh     |  8 +--
 .../Console/UserInput/AbstractUserInput.hh    | 10 ++--
 src/Titon/Console/UserInput/Confirm.hh        |  6 +-
 src/Titon/Console/UserInput/Prompt.hh         |  4 +-
 src/Titon/Console/bootstrap.hh                |  9 ++-
 11 files changed, 159 insertions(+), 57 deletions(-)

diff --git a/src/Titon/Console/Command.hh b/src/Titon/Console/Command.hh
index ab05d2d..f98ec70 100644
--- a/src/Titon/Console/Command.hh
+++ b/src/Titon/Console/Command.hh
@@ -7,10 +7,11 @@
 
 namespace Titon\Console;
 
+use Titon\Console\Input;
+use Titon\Console\Output;
 use Titon\Console\InputDefinition\Argument;
 use Titon\Console\InputDefinition\Flag;
 use Titon\Console\InputDefinition\Option;
-use Titon\Console\Input;
 
 /**
  * A `Command` is a user-defined class that can to register user input and run
@@ -81,11 +82,20 @@ interface Command {
     public function run(): void;
 
     /**
-     * Set the `Input` objet for the commandd.
+     * Set the `Input` object for the commandd.
      *
      * @param \Titon\Console\Input $input The `Input` object
      *
      * @return $this
      */
     public function setInput(Input $input): this;
+
+    /**
+     * Set the `Output` object for the commandd.
+     *
+     * @param \Titon\Console\Output $input The `Output` object
+     *
+     * @return $this
+     */
+    public function setOutput(Output $output): this;
 }
\ No newline at end of file
diff --git a/src/Titon/Console/Command/AbstractCommand.hh b/src/Titon/Console/Command/AbstractCommand.hh
index 95d0999..6e1fd92 100644
--- a/src/Titon/Console/Command/AbstractCommand.hh
+++ b/src/Titon/Console/Command/AbstractCommand.hh
@@ -10,10 +10,10 @@ namespace Titon\Console\Command;
 use Titon\Console\InputBag;
 use Titon\Console\Command;
 use Titon\Console\Input;
+use Titon\Console\Output;
 use Titon\Console\InputDefinition\Argument;
 use Titon\Console\InputDefinition\Flag;
 use Titon\Console\InputDefinition\Option;
-use Titon\Console\Output;
 
 /**
  * A `Command` is a class that configures necessary command line inputs from the
@@ -81,8 +81,6 @@ abstract class AbstractCommand implements Command {
         $this->arguments = new InputBag();
         $this->flags = new InputBag();
         $this->options = new InputBag();
-
-        $this->output = Output::getInstance();
     }
 
     /**
@@ -124,6 +122,15 @@ abstract class AbstractCommand implements Command {
         return $this;
     }
 
+    /**
+     * Alias method for sending output through STDERROR.
+     *
+     * @param string $output    The message to send
+     */
+    protected function out(string $output): void {
+        $this->output->error($output);
+    }
+
     /**
      * Retrieve an `Argument` value by key.
      *
@@ -214,6 +221,15 @@ abstract class AbstractCommand implements Command {
         return $this->options;
     }
 
+    /**
+     * Alias method for sending output through STDOUT.
+     *
+     * @param string $output    The message to send
+     */
+    protected function out(string $output): void {
+        $this->output->out($output);
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -265,4 +281,13 @@ abstract class AbstractCommand implements Command {
 
         return $this;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setOutput(Output $output): this {
+        $this->output = $output;
+
+        return $this;
+    }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/Console.hh b/src/Titon/Console/Console.hh
index c2e7a3f..365ba49 100644
--- a/src/Titon/Console/Console.hh
+++ b/src/Titon/Console/Console.hh
@@ -43,9 +43,17 @@ class Console {
     /**
      * Construct a new `Console` application.
      */
-    public function __construct() {
-        $this->input = Input::getInstance();
-        $this->output = Output::getInstance();
+    public function __construct(?Input $input = null, ?Output $output = null) {
+        if (is_null($input)) {
+            $input = new Input();
+        }
+
+        if (is_null($output)) {
+            $output = new Output();
+        }
+
+        $this->input = $input;
+        $this->output = $output;
     }
 
     /**
@@ -57,7 +65,7 @@ class Console {
      */
     public function addCommand(Command $command): this {
         $command->setInput($this->input);
-        $command->configure();
+        $command->setOutput($this->output);
 
         $this->input->addCommand($command);
 
diff --git a/src/Titon/Console/Feedback/AbstractFeedback.hh b/src/Titon/Console/Feedback/AbstractFeedback.hh
index 29d428a..6b306b1 100644
--- a/src/Titon/Console/Feedback/AbstractFeedback.hh
+++ b/src/Titon/Console/Feedback/AbstractFeedback.hh
@@ -91,9 +91,9 @@ abstract class AbstractFeedback implements Feedback {
     /**
      * The time the feedback started.
      *
-     * @var int|null
+     * @var int
      */
-    protected ?int $start;
+    protected int $start = -1;
 
     /**
      * The template used to suffix the output.
@@ -105,16 +105,16 @@ abstract class AbstractFeedback implements Feedback {
     /**
      * The current tick used to calculate the speed.
      *
-     * @var int|null
+     * @var int
      */
-    protected ?int $tick;
+    protected int $tick = -1;
 
     /**
      * The feedback running time.
      *
-     * @var int|null
+     * @var int
      */
-    protected ?int $timer;
+    protected int $timer = -1;
 
     /**
      * The total number of cycles expected for the feedback to take until finished.
@@ -154,7 +154,7 @@ abstract class AbstractFeedback implements Feedback {
      *
      * @return Map<string, mixed>
      */
-    protected function buildOutputVariables(): Map<string, mixed> {
+    protected function buildOutputVariables(): FeedbackVariables {
         $message = $this->message;
         $percent = str_pad(floor($this->getPercentageComplete() * 100), 3);;
         $estimated = $this->formatTime((int)$this->estimateTimeRemaining());
@@ -162,12 +162,12 @@ abstract class AbstractFeedback implements Feedback {
             $this->formatTime($this->getElapsedTime()), strlen($estimated)
         );
 
-        $variables = Map {
+        $variables = shape(
             'message'   => $message,
             'percent'   => $percent,
             'elapsed'   => $elapsed,
             'estimated' => $estimated,
-        };
+        );
 
         return $variables;
     }
@@ -240,12 +240,10 @@ abstract class AbstractFeedback implements Feedback {
      * @var int
      */
     protected function getElapsedTime(): int {
-        if (is_null($start = $this->start)) {
+        if ($this->start < 0) {
             return 0;
         }
 
-        invariant(!is_null($start), "Must not be null.");
-
         return (time() - $start);
     }
 
@@ -269,19 +267,16 @@ abstract class AbstractFeedback implements Feedback {
      * @return float
      */
     protected function getSpeed(): float {
-        if (is_null($this->start)) {
+        if ($this->start < 0) {
             return 0.0;
         }
 
-        if (is_null($tick = $this->tick)) {
+        if ($this->tick < 0) {
             $this->tick = $this->start;
-            $tick = $this->tick;
         }
 
-        invariant(!is_null($tick), "Must not be null.");
-
         $now = microtime(true);
-        $span = $now - $tick;
+        $span = $now - $this->tick;
         if ($span > 1) {
             $this->iteration++;
             $this->tick = $now;
@@ -329,9 +324,9 @@ abstract class AbstractFeedback implements Feedback {
      * @return $this
      */
     protected function setMaxLength(): this {
-        $this->maxLength = max(array_map(($key) ==> {
-            return strlen($key);
-        }, $this->characterSequence));
+        $this->maxLength = max(
+            $this->characterSequence->map(($key) ==> strlen($key))->toArray()
+        );
 
         return $this;
     }
@@ -381,7 +376,7 @@ abstract class AbstractFeedback implements Feedback {
     protected function shouldUpdate(): bool {
         $now = microtime(true) * 1000;
 
-        if (is_null($this->timer)) {
+        if ($this->timer < 0) {
             $this->start = (int)(($this->timer = $now) / 1000);
 
             return true;
diff --git a/src/Titon/Console/HelpScreen.hh b/src/Titon/Console/HelpScreen.hh
index 1bf6076..dc4a40e 100644
--- a/src/Titon/Console/HelpScreen.hh
+++ b/src/Titon/Console/HelpScreen.hh
@@ -53,9 +53,9 @@ class HelpScreen {
      * The optional `name` of the application when not outputting a `HelpScreen`
      * for a specific `Command`.
      *
-     * @var string|null
+     * @var string
      */
-    protected ?string $name;
+    protected string $name = '';
 
     /**
      * The available `Option` objects accepted.
@@ -123,12 +123,16 @@ class HelpScreen {
     protected function renderCommands(): string {
         ksort($this->commands);
 
-        $maxLength = max(array_map(function(string $key): int {
-            $indentation = substr_count($key, ':');
-            $key = str_repeat('  ', $indentation) . $key;
+        $maxLength = max(
+            $this->comamands->keys()->map(
+                ($key) ==> {
+                    $indentation = substr_count($key, ':');
+                    $key = str_repeat('  ', $indentation) . $key;
 
-            return strlen($key);
-        }, $this->commands->keys()));
+                    return strlen($key);
+                }
+            )
+        );
         $descriptionLength = 80 - 4 - $maxLength;
 
         $output = Vector {};
@@ -194,7 +198,7 @@ class HelpScreen {
             } else {
                 $retval = $command->getName();
             }
-        } else if (!is_null($this->name)) {
+        } else if ($this->name !== '') {
             $retval = $this->name;
         }
 
diff --git a/src/Titon/Console/Input.hh b/src/Titon/Console/Input.hh
index 32cc5c7..53e3178 100644
--- a/src/Titon/Console/Input.hh
+++ b/src/Titon/Console/Input.hh
@@ -7,6 +7,7 @@
 
 namespace Titon\Console;
 
+use Titon\Console\InputDefinition\AbstractInputDefinition;
 use Titon\Utility\State\Server;
 use Titon\Console\InputDefinition\Argument;
 use Titon\Console\InputDefinition\Flag;
@@ -81,6 +82,13 @@ class Input {
      */
     protected InputBag<Option> $options;
 
+    /**
+     * Boolean if the provided input has already been parsed or not.
+     *
+     * @var bool
+     */
+    protected bool $parsed = false;
+
     /**
      * Raw input used at creation of the `Input` object.
      *
@@ -181,6 +189,10 @@ class Input {
      * @return \Titon\Console\Command|null
      */
     public function getActiveCommand(): ?Command {
+        if ($this->parsed === true) {
+            return $this->command;
+        }
+
         if (!is_null($this->command)) {
             return $this->command;
         }
@@ -333,12 +345,54 @@ class Input {
                     $this->command = $command;
                     continue;
                 }
-            } else {
-                throw new InvalidNumberOfCommandsException("Multiple commands are not supported.");
+            } else if (!is_null($this->commands->get($val['value']))) {
+                if ($this->strict === true) {
+                    throw new InvalidNumberOfCommandsException("Multiple commands are not supported.");
+                }
+            }
+
+            if ($this->strict === true) {
+                throw new InvalidNumberOfArguments(sprintf("No parameter registered for value %s", $val['value']));
             }
 
             $this->invalid[] = $val;
         }
+
+        if (is_null($this->command) && $this->strict === true) {
+            throw new InvalidNumberOfCommandsException("No command was parsed from the input.");
+        }
+
+        foreach ($this->flags as $name => $flag) {
+            if ($flag->getMode() !== AbstractInputDefinition::MODE_REQUIRED) {
+                continue;
+            }
+
+            if (is_null($flag->getValue())) {
+                throw new MissingValueException(sprintf("Required flag `%s` is not present.", $flag->getName()));
+            }
+        }
+
+        foreach ($this->options as $name => $option) {
+            if ($option->getMode() !== AbstractInputDefinition::MODE_REQUIRED) {
+                continue;
+            }
+
+            if (is_null($option->getValue())) {
+                throw new MissingValueException(sprintf("No value present for required option %s", $option->getName()));
+            }
+        }
+
+        foreach ($this->arguments as $name => $argument) {
+            if ($argument->getMode() !== AbstractInputDefinition::MODE_REQUIRED) {
+                continue;
+            }
+
+            if (is_null($argument->getValue())) {
+                throw new MissingValueException(sprintf("No value present for required argument %s", $argument->getName()));
+            }
+        }
+
+        $this->parsed = true;
     }
 
     /**
@@ -448,6 +502,7 @@ class Input {
     public function setInput(Vector<string> $args): this {
         $this->rawInput = $args;
         $this->input = new InputLexer($args);
+        $this->parsed = false;
         $this->command = null;
 
         return $this;
diff --git a/src/Titon/Console/InputDefinition/Flag.hh b/src/Titon/Console/InputDefinition/Flag.hh
index f48cb56..b1ce2be 100644
--- a/src/Titon/Console/InputDefinition/Flag.hh
+++ b/src/Titon/Console/InputDefinition/Flag.hh
@@ -18,9 +18,9 @@ class Flag extends AbstractInputDefinition<int> {
      * The negative alias of the `Flag` (i.e., --no-foo for -foo). A negative
      * value is only available if a 'long' `Flag` name is available.
      *
-     * @var string|null
+     * @var string
      */
-    protected ?string $negativeAlias;
+    protected string $negativeAlias = '';
 
     /**
      * Whether the flag is stackable or not (i.e., -fff is given a value of 3).
@@ -51,9 +51,9 @@ class Flag extends AbstractInputDefinition<int> {
     /**
      * Retrieve the negative alias of the `Flag` or null of none.
      *
-     * @return string|null
+     * @return string
      */
-    public function getNegativeAlias(): ?string {
+    public function getNegativeAlias(): string {
         return $this->negativeAlias;
     }
 
diff --git a/src/Titon/Console/UserInput/AbstractUserInput.hh b/src/Titon/Console/UserInput/AbstractUserInput.hh
index 6231b2a..5039326 100644
--- a/src/Titon/Console/UserInput/AbstractUserInput.hh
+++ b/src/Titon/Console/UserInput/AbstractUserInput.hh
@@ -29,9 +29,9 @@ abstract class AbstractUserInput implements UserInput {
     /**
      * Default value if input given is empty.
      *
-     * @var string|null
+     * @var string
      */
-    protected ?string $default;
+    protected string $default = '';
 
     /**
      * `Input` object used for retrieving user input.
@@ -57,9 +57,9 @@ abstract class AbstractUserInput implements UserInput {
     /**
      * Construct a new `UserInput` object.
      */
-    public function __construct() {
-        $this->input = Input::getInstance();
-        $this->output = Output::getInstance();
+    public function __construct(Input $input, Output $output) {
+        $this->input = $input;
+        $this->output = $output;
     }
 
     /**
diff --git a/src/Titon/Console/UserInput/Confirm.hh b/src/Titon/Console/UserInput/Confirm.hh
index 44d4f06..9d8a6b1 100644
--- a/src/Titon/Console/UserInput/Confirm.hh
+++ b/src/Titon/Console/UserInput/Confirm.hh
@@ -13,7 +13,7 @@ class Confirm extends AbstractUserInput {
 
     protected string $message;
 
-    public function __construct(?string $default = null) {
+    public function __construct(string $default = '') {
         parent::__construct();
 
         $this->acceptedValues = Map {
@@ -62,10 +62,10 @@ class Confirm extends AbstractUserInput {
         do {
             $this->output->out("$this->message ", Output::VERBOSITY_NORMAL, 0);
             $input = $this->input->getUserInput();
-            if ($input === '' && !is_null($this->default)) {
+            if ($input === '' && $this->default !== '') {
                 $input = $this->default;
             }
-        } while (!$this->acceptedValues->contains($input));
+        } while (!$this->acceptedValues->contains(strtolower($input)));
 
         return $input;
     }
diff --git a/src/Titon/Console/UserInput/Prompt.hh b/src/Titon/Console/UserInput/Prompt.hh
index 731199f..10e7d48 100644
--- a/src/Titon/Console/UserInput/Prompt.hh
+++ b/src/Titon/Console/UserInput/Prompt.hh
@@ -30,7 +30,7 @@ class Prompt extends AbstractUserInput {
      *
      * @param Map<mixed, mixed> $choices    Predetermined accepted choices
      */
-    public function __construct(Map<mixed, mixed> $choices = Map {}, ?string $default = null) {
+    public function __construct(Map<mixed, mixed> $choices = Map {}, string $default = '') {
         parent::__construct();
 
         $this->default = $default;
@@ -51,7 +51,7 @@ class Prompt extends AbstractUserInput {
             $this->output->out("$message: ", Output::VERBOSITY_NORMAL, 0);
             $input = $this->input->getUserInput();
 
-            if ($input === '' && !is_null($this->default)) {
+            if ($input === '' && $this->default !== '') {
                 $input = $this->default;
             }
 
diff --git a/src/Titon/Console/bootstrap.hh b/src/Titon/Console/bootstrap.hh
index 3320938..21fd329 100644
--- a/src/Titon/Console/bootstrap.hh
+++ b/src/Titon/Console/bootstrap.hh
@@ -15,11 +15,16 @@
 
 namespace Titon\Console {
 
-    type ArgumentList = array<mixed>;
+    type CommandMap = Map<string, Command>;
+    type FeedbackVariables = shape(
+        'message'   => string,
+        'percent'   => int,
+        'elapsed'   => string,
+        'estimated' => string,
+    );
     type RawInput = shape(
         'raw'   => string,
         'value' => string
     );
     type StyleMap = Map<string, StyleDefinition>;
-    type CommandMap = Map<string, Command>;
 }

From 249ec8098f48ce90418646bb33dbd304b70ced3f Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Mon, 9 Mar 2015 21:43:59 -0400
Subject: [PATCH 46/92] fixed bug where the input parser needs to parse for
 potential command before the arguments.

---
 src/Titon/Console/Command/AbstractCommand.hh       | 14 +++++++-------
 src/Titon/Console/Input.hh                         |  9 +++++----
 .../{ArgumentParserTest.hh => InputTest.hh}        |  5 +++--
 3 files changed, 15 insertions(+), 13 deletions(-)
 rename tests/Titon/Console/{ArgumentParserTest.hh => InputTest.hh} (96%)

diff --git a/src/Titon/Console/Command/AbstractCommand.hh b/src/Titon/Console/Command/AbstractCommand.hh
index 6e1fd92..3591a11 100644
--- a/src/Titon/Console/Command/AbstractCommand.hh
+++ b/src/Titon/Console/Command/AbstractCommand.hh
@@ -86,7 +86,7 @@ abstract class AbstractCommand implements Command {
     /**
      * Add a new `Argument` to be registered and parsed with the `Input`.
      *
-     * @param \Titon\Console\Argument $argument
+     * @param \Titon\Console\InputDefinition\Argument $argument
      *
      * @return $this
      */
@@ -99,7 +99,7 @@ abstract class AbstractCommand implements Command {
     /**
      * Add a new `Flag` to be registered and parsed with the `Input`.
      *
-     * @param \Titon\Console\Flag $flag
+     * @param \Titon\Console\InputDefinition\Flag $flag
      *
      * @return $this
      */
@@ -112,7 +112,7 @@ abstract class AbstractCommand implements Command {
     /**
      * Add a new `Option` to be registered and parsed with the `Input`.
      *
-     * @param \Titon\Console\Option $option
+     * @param \Titon\Console\InputDefinition\Option $option
      *
      * @return $this
      */
@@ -127,7 +127,7 @@ abstract class AbstractCommand implements Command {
      *
      * @param string $output    The message to send
      */
-    protected function out(string $output): void {
+    protected function error(string $output): void {
         $this->output->error($output);
     }
 
@@ -138,7 +138,7 @@ abstract class AbstractCommand implements Command {
      *
      * @return mixed
      */
-    protected function getArgument(string $key): mixed {
+    protected function getArgument(string $key): ?string {
         if ($argument = $this->input->getArgument($key)) {
             return $argument->getValue();
         }
@@ -171,7 +171,7 @@ abstract class AbstractCommand implements Command {
      *
      * @return mixed
      */
-    protected function getFlag(string $key): mixed {
+    protected function getFlag(string $key): ?int {
         if ($flag = $this->input->getFlag($key)) {
             return $flag->getValue();
         }
@@ -204,7 +204,7 @@ abstract class AbstractCommand implements Command {
      *
      * @return mixed
      */
-    protected function getOption(string $key): mixed {
+    protected function getOption(string $key): ?string {
         if ($option = $this->input->getOption($key)) {
             return $option->getValue();
         }
diff --git a/src/Titon/Console/Input.hh b/src/Titon/Console/Input.hh
index 53e3178..c972623 100644
--- a/src/Titon/Console/Input.hh
+++ b/src/Titon/Console/Input.hh
@@ -200,9 +200,9 @@ class Input {
         $input = new Vector($this->rawInput);
         foreach ($input as $index => $value) {
             if (!is_null($command = $this->commands->get($value))) {
-                $this->command = $command;
                 $input->removeKey($index);
                 $this->setInput($input);
+                $this->command = $command;
 
                 return $this->command;
             }
@@ -335,9 +335,6 @@ class Input {
             if ($this->parseOption($val)) {
                 continue;
             }
-            if ($this->parseArgument($val)) {
-                continue;
-            }
 
             if (is_null($this->command)) {
                 // If we haven't parsed a command yet, see if we have a match.
@@ -351,6 +348,10 @@ class Input {
                 }
             }
 
+            if ($this->parseArgument($val)) {
+                continue;
+            }
+
             if ($this->strict === true) {
                 throw new InvalidNumberOfArguments(sprintf("No parameter registered for value %s", $val['value']));
             }
diff --git a/tests/Titon/Console/ArgumentParserTest.hh b/tests/Titon/Console/InputTest.hh
similarity index 96%
rename from tests/Titon/Console/ArgumentParserTest.hh
rename to tests/Titon/Console/InputTest.hh
index fe84b75..3c1db53 100644
--- a/tests/Titon/Console/ArgumentParserTest.hh
+++ b/tests/Titon/Console/InputTest.hh
@@ -11,7 +11,7 @@ use Titon\Console\InputDefinition\Argument;
 /**
  * @property \Titon\Console\Input $input
  */
-class ArgumentParserTest extends TestCase {
+class InputTest extends TestCase {
 
     public function setUp() {
         $this->input = new Input();
@@ -154,9 +154,10 @@ class ArgumentParserTest extends TestCase {
         $this->input->addFlag((new Flag('foo'))->alias('f'));
         $this->input->addArgument(new Argument('name'));
 
-        $this->input->getActiveCommand();
+        $test = $this->input->getActiveCommand();
         $this->input->parse();
 
+        $this->assertEquals('command', $this->input->getActiveCommand()->getName());
         $this->assertEquals('Alex Phillips', $this->input->getArgument('name')->getValue());
         $this->assertEquals(1, $this->input->getFlag('foo')->getValue());
         $this->assertEquals(1, $this->input->getFlag('f')->getValue());

From bfc18d6dbfb1c708250dec6c3e3e2dcdb24a253c Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Mon, 9 Mar 2015 21:44:24 -0400
Subject: [PATCH 47/92] missed a delete for a test

---
 tests/Titon/Console/InputTest.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Titon/Console/InputTest.hh b/tests/Titon/Console/InputTest.hh
index 3c1db53..b62fab6 100644
--- a/tests/Titon/Console/InputTest.hh
+++ b/tests/Titon/Console/InputTest.hh
@@ -154,7 +154,7 @@ class InputTest extends TestCase {
         $this->input->addFlag((new Flag('foo'))->alias('f'));
         $this->input->addArgument(new Argument('name'));
 
-        $test = $this->input->getActiveCommand();
+        $this->input->getActiveCommand();
         $this->input->parse();
 
         $this->assertEquals('command', $this->input->getActiveCommand()->getName());

From a44fc1347b1bedcd5344e2953d33695d776c2b6e Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 10 Mar 2015 07:54:17 -0400
Subject: [PATCH 48/92] fixed type errors, made adjustements per comments in PR

---
 src/Titon/Console/Command/AbstractCommand.hh  | 57 +++++++++++++-
 src/Titon/Console/Console.hh                  |  7 +-
 .../Exception/InvalidNumberOfArguments.hh     |  2 +-
 .../Console/Feedback/AbstractFeedback.hh      |  8 +-
 src/Titon/Console/HelpScreen.hh               |  3 +-
 src/Titon/Console/Input.hh                    |  3 +-
 .../Console/UserInput/AbstractUserInput.hh    | 13 ++++
 src/Titon/Console/UserInput/Confirm.hh        | 74 +++++++++++--------
 src/Titon/Console/UserInput/Menu.hh           | 27 +++----
 src/Titon/Console/UserInput/Prompt.hh         | 12 ---
 10 files changed, 138 insertions(+), 68 deletions(-)

diff --git a/src/Titon/Console/Command/AbstractCommand.hh b/src/Titon/Console/Command/AbstractCommand.hh
index 3591a11..539eee9 100644
--- a/src/Titon/Console/Command/AbstractCommand.hh
+++ b/src/Titon/Console/Command/AbstractCommand.hh
@@ -14,6 +14,8 @@ use Titon\Console\Output;
 use Titon\Console\InputDefinition\Argument;
 use Titon\Console\InputDefinition\Flag;
 use Titon\Console\InputDefinition\Option;
+use Titon\Console\UserInput\Menu;
+use Titon\Console\UserInput\Prompt;
 
 /**
  * A `Command` is a class that configures necessary command line inputs from the
@@ -57,7 +59,7 @@ abstract class AbstractCommand implements Command {
      *
      * @var string
      */
-    protected string $name;
+    protected string $name = '';
 
     /**
      * Bag container holding all registered `Option` objects
@@ -76,8 +78,9 @@ abstract class AbstractCommand implements Command {
     /**
      * Construct a new instance of a command.
      */
-    public function __construct() {
-        $this->input = new Input();
+    public function __construct(Input $input, Output $output) {
+        $this->input = $input;
+        $this->output = $output;
         $this->arguments = new InputBag();
         $this->flags = new InputBag();
         $this->options = new InputBag();
@@ -122,6 +125,22 @@ abstract class AbstractCommand implements Command {
         return $this;
     }
 
+    /**
+     * Construct and return a new `Menu` object given the choices and display
+     * message.
+     *
+     * @param Map<mixed, mixed> $choices    Accepted values
+     * @param string $message               The message to display before the choices
+     *
+     * @return \Titon\Console\UserInput\Menu
+     */
+    protected function confirm(Map<mixed, mixed> $choices, string $message = ''): Menu {
+        $menu = new Menu($this->input, $this->output);
+        $menu->setAcceptedValues($choices)->setMessage($message);
+
+        return $menu;
+    }
+
     /**
      * Alias method for sending output through STDERROR.
      *
@@ -221,6 +240,22 @@ abstract class AbstractCommand implements Command {
         return $this->options;
     }
 
+    /**
+     * Construct and return a new `Menu` object given the choices and display
+     * message.
+     *
+     * @param Map<mixed, mixed> $choices    Accepted values
+     * @param string $message               The message to display before the choices
+     *
+     * @return \Titon\Console\UserInput\Menu
+     */
+    protected function menu(Map<mixed, mixed> $choices, string $message = ''): Menu {
+        $menu = new Menu($this->input, $this->output);
+        $menu->setAcceptedValues($choices)->setMessage($message);
+
+        return $menu;
+    }
+
     /**
      * Alias method for sending output through STDOUT.
      *
@@ -230,6 +265,22 @@ abstract class AbstractCommand implements Command {
         $this->output->out($output);
     }
 
+    /**
+     * Construct and return a new `Prompt` object given the accepted choices and
+     * default value.
+     *
+     * @param Map<mixed, mixed> $choices    Accepted values
+     * @param string $default               Default value
+     *
+     * @return \Titon\Console\UserInput\Prompt
+     */
+    protected function prompt(Map<mixed, mixed> $choices = Map {}, string $default = ''): Prompt {
+        $prompt = new Prompt($this->input, $this->output);
+        $prompt->setAcceptedValues($choices)->setDefault($default);
+
+        return $prompt;
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Titon/Console/Console.hh b/src/Titon/Console/Console.hh
index 365ba49..6c2ea43 100644
--- a/src/Titon/Console/Console.hh
+++ b/src/Titon/Console/Console.hh
@@ -10,6 +10,7 @@ namespace Titon\Console;
 use Titon\Console\Input;
 use Titon\Console\Output;
 use Titon\Console\InputDefinition\Flag;
+use ReflectionClass;
 
 /**
  * The `Console` class bootstraps and handles Input and Output to process and
@@ -63,9 +64,9 @@ class Console {
      *
      * @return $this
      */
-    public function addCommand(Command $command): this {
-        $command->setInput($this->input);
-        $command->setOutput($this->output);
+    public function addCommand(string $command): this {
+        $command = new ReflectionClass($command);
+        $command = $command->newInstance($this->input, $this->output);
 
         $this->input->addCommand($command);
 
diff --git a/src/Titon/Console/Exception/InvalidNumberOfArguments.hh b/src/Titon/Console/Exception/InvalidNumberOfArguments.hh
index 782525b..5eeaa04 100644
--- a/src/Titon/Console/Exception/InvalidNumberOfArguments.hh
+++ b/src/Titon/Console/Exception/InvalidNumberOfArguments.hh
@@ -15,6 +15,6 @@ use RuntimeException;
  *
  * @package Titon\Console\Exception
  */
-class InvalidNumberOfCommandsException extends RuntimeException {
+class InvalidNumberOfArgumentsException extends RuntimeException {
 
 }
diff --git a/src/Titon/Console/Feedback/AbstractFeedback.hh b/src/Titon/Console/Feedback/AbstractFeedback.hh
index 6b306b1..42941e9 100644
--- a/src/Titon/Console/Feedback/AbstractFeedback.hh
+++ b/src/Titon/Console/Feedback/AbstractFeedback.hh
@@ -154,7 +154,7 @@ abstract class AbstractFeedback implements Feedback {
      *
      * @return Map<string, mixed>
      */
-    protected function buildOutputVariables(): FeedbackVariables {
+    protected function buildOutputVariables(): Map<string, mixed> {
         $message = $this->message;
         $percent = str_pad(floor($this->getPercentageComplete() * 100), 3);;
         $estimated = $this->formatTime((int)$this->estimateTimeRemaining());
@@ -162,12 +162,12 @@ abstract class AbstractFeedback implements Feedback {
             $this->formatTime($this->getElapsedTime()), strlen($estimated)
         );
 
-        $variables = shape(
+        $variables = Map {
             'message'   => $message,
             'percent'   => $percent,
             'elapsed'   => $elapsed,
             'estimated' => $estimated,
-        );
+        };
 
         return $variables;
     }
@@ -244,7 +244,7 @@ abstract class AbstractFeedback implements Feedback {
             return 0;
         }
 
-        return (time() - $start);
+        return (time() - $this->start);
     }
 
     /**
diff --git a/src/Titon/Console/HelpScreen.hh b/src/Titon/Console/HelpScreen.hh
index dc4a40e..0cb8669 100644
--- a/src/Titon/Console/HelpScreen.hh
+++ b/src/Titon/Console/HelpScreen.hh
@@ -123,8 +123,9 @@ class HelpScreen {
     protected function renderCommands(): string {
         ksort($this->commands);
 
+        $indentation = 0;
         $maxLength = max(
-            $this->comamands->keys()->map(
+            $this->commands->keys()->map(
                 ($key) ==> {
                     $indentation = substr_count($key, ':');
                     $key = str_repeat('  ', $indentation) . $key;
diff --git a/src/Titon/Console/Input.hh b/src/Titon/Console/Input.hh
index c972623..daf1e35 100644
--- a/src/Titon/Console/Input.hh
+++ b/src/Titon/Console/Input.hh
@@ -14,6 +14,7 @@ use Titon\Console\InputDefinition\Flag;
 use Titon\Console\InputDefinition\Option;
 use Titon\Console\Exception\MissingValueException;
 use Titon\Console\Exception\InvalidNumberOfCommandsException;
+use Titon\Console\Exception\InvalidNumberOfArgumentsException;
 
 /**
  * The `Input` class contains all available `Flag`, `Argument`, `Option`, and
@@ -353,7 +354,7 @@ class Input {
             }
 
             if ($this->strict === true) {
-                throw new InvalidNumberOfArguments(sprintf("No parameter registered for value %s", $val['value']));
+                throw new InvalidNumberOfArgumentsException(sprintf("No parameter registered for value %s", $val['value']));
             }
 
             $this->invalid[] = $val;
diff --git a/src/Titon/Console/UserInput/AbstractUserInput.hh b/src/Titon/Console/UserInput/AbstractUserInput.hh
index 5039326..77fb14e 100644
--- a/src/Titon/Console/UserInput/AbstractUserInput.hh
+++ b/src/Titon/Console/UserInput/AbstractUserInput.hh
@@ -62,6 +62,19 @@ abstract class AbstractUserInput implements UserInput {
         $this->output = $output;
     }
 
+    /**
+     * Set the values accepted by the user.
+     *
+     * @param Map<mixed, mixed> $choices    Accepted values
+     *
+     * @return $this
+     */
+    public function setAcceptedValues(Map<mixed, mixed> $choices = Map {}): this {
+        $this->acceptedValues = $choices;
+
+        return $this;
+    }
+
     /**
      * Set the default value to use when input is empty.
      *
diff --git a/src/Titon/Console/UserInput/Confirm.hh b/src/Titon/Console/UserInput/Confirm.hh
index 9d8a6b1..6589971 100644
--- a/src/Titon/Console/UserInput/Confirm.hh
+++ b/src/Titon/Console/UserInput/Confirm.hh
@@ -11,37 +11,22 @@ use Titon\Console\Output;
 
 class Confirm extends AbstractUserInput {
 
-    protected string $message;
-
-    public function __construct(string $default = '') {
-        parent::__construct();
-
-        $this->acceptedValues = Map {
-            0 => 'y',
-            1 => 'yes',
-            2 => 'n',
-            3 => 'no'
-        };
-
-        switch (strtolower($default)) {
-            case 'y':
-            case 'yes':
-                $this->default = $default;
-                $message = " [Y/n]";
-                break;
-            case 'n':
-            case 'no':
-                $this->default = $default;
-                $message = " [y/N]";
-                break;
-            default:
-                $message = " [y/n]";
-                break;
-        }
-
-        $this->message = $message;
-    }
+    /**
+     * The message to be appened to the prompt message containing the accepted
+     * values.
+     *
+     * @var string
+     */
+    protected string $message = '';
 
+    /**
+     * Prompt the user for input and return the boolean value if the user has
+     * confirmed or not.
+     *
+     * @param string $message   The message to prompt the user with
+     *
+     * @return bool
+     */
     public function confirmed(string $message): bool {
         $input = $this->prompt($message);
 
@@ -56,6 +41,9 @@ class Confirm extends AbstractUserInput {
         }
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function prompt(string $message): string {
         $message = "$message $this->message";
 
@@ -69,4 +57,30 @@ class Confirm extends AbstractUserInput {
 
         return $input;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    <<__Override>>
+    public function setDefault(string $default = ''): this {
+        switch (strtolower($default)) {
+            case 'y':
+            case 'yes':
+                $this->default = $default;
+                $message = " [Y/n]";
+                break;
+            case 'n':
+            case 'no':
+                $this->default = $default;
+                $message = " [y/N]";
+                break;
+            default:
+                $message = " [y/n]";
+                break;
+        }
+
+        $this->message = $message;
+
+        return $this;
+    }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/UserInput/Menu.hh b/src/Titon/Console/UserInput/Menu.hh
index da572f8..7aaaeb5 100644
--- a/src/Titon/Console/UserInput/Menu.hh
+++ b/src/Titon/Console/UserInput/Menu.hh
@@ -22,19 +22,7 @@ class Menu extends AbstractUserInput {
      *
      * @var string
      */
-    protected string $message;
-
-    /**
-     * Construct a new `Menu` with the available choices.
-     *
-     * @param Map<mixed, mixed> $choices    Available choices accepted
-     */
-    public function __construct(Map<mixed, mixed> $choices, string $message = '') {
-        parent::__construct();
-
-        $this->acceptedValues = $choices;
-        $this->message = $message;
-    }
+    protected string $message = '';
 
     /**
      * {@inheritdoc}
@@ -69,4 +57,17 @@ class Menu extends AbstractUserInput {
             }
         }
     }
+
+    /**
+     * Set the message presented to the user before the options are displayed.
+     *
+     * @param string $message   The message to display
+     *
+     * @return $this
+     */
+    public function setMessage(string $message): this {
+        $this->message = $message;
+
+        return $this;
+    }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/UserInput/Prompt.hh b/src/Titon/Console/UserInput/Prompt.hh
index 10e7d48..027b605 100644
--- a/src/Titon/Console/UserInput/Prompt.hh
+++ b/src/Titon/Console/UserInput/Prompt.hh
@@ -25,18 +25,6 @@ class Prompt extends AbstractUserInput {
      */
     protected string $hint = '';
 
-    /**
-     * Construct a new `Prompt` object with accepted values (if any).
-     *
-     * @param Map<mixed, mixed> $choices    Predetermined accepted choices
-     */
-    public function __construct(Map<mixed, mixed> $choices = Map {}, string $default = '') {
-        parent::__construct();
-
-        $this->default = $default;
-        $this->acceptedValues = $choices;
-    }
-
     /**
      * {@inheritdoc}
      */

From 099bcd8edcff35b6bd10dbe78300c60039da64d4 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 10 Mar 2015 07:59:43 -0400
Subject: [PATCH 49/92] since we're not using nullable class variables, need to
 account for empty alias strings when rendering the help screen

---
 src/Titon/Console/HelpScreen.hh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Titon/Console/HelpScreen.hh b/src/Titon/Console/HelpScreen.hh
index 0cb8669..c73de3c 100644
--- a/src/Titon/Console/HelpScreen.hh
+++ b/src/Titon/Console/HelpScreen.hh
@@ -265,8 +265,8 @@ class HelpScreen {
 
             foreach ($command->getFlags() as $argument) {
                 $arg = $argument->getFormattedName($argument->getName());
-                if ($alias = $argument->getFormattedName($argument->getAlias())) {
-                    $arg .= "|$alias";
+                if ($argument->getAlias() !== '') {
+                    $arg .= "|" . $argument->getFormattedName($argument->getAlias());
                 }
 
                 if ($argument->getMode() === AbstractInputDefinition::MODE_OPTIONAL) {
@@ -275,8 +275,8 @@ class HelpScreen {
             }
             foreach ($command->getOptions() as $argument) {
                 $arg = $argument->getFormattedName($argument->getName());
-                if ($alias = $argument->getFormattedName($argument->getAlias())) {
-                    $arg .= "|$alias";
+                if ($argument->getAlias() !== '') {
+                    $arg .= "|" . $argument->getFormattedName($argument->getAlias());
                 }
 
                 if ($argument->getMode() === AbstractInputDefinition::MODE_OPTIONAL) {

From 239cef91b4b6f52a23278059a68518cad52d18a3 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 10 Mar 2015 09:16:35 -0400
Subject: [PATCH 50/92] addCommand now accepts the command string name for
 input/output injection in the constructor

---
 tests/Titon/Console/InputTest.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Titon/Console/InputTest.hh b/tests/Titon/Console/InputTest.hh
index b62fab6..5ce0e9f 100644
--- a/tests/Titon/Console/InputTest.hh
+++ b/tests/Titon/Console/InputTest.hh
@@ -15,7 +15,7 @@ class InputTest extends TestCase {
 
     public function setUp() {
         $this->input = new Input();
-        $this->input->addCommand(new CommandStub());
+        $this->input->addCommand('\Titon\Test\Stub\CommandStub');
     }
 
     public function testParseFlags(): void {

From 23eb04d4d233f4e2686e08501dc36d5d33620d3b Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 10 Mar 2015 10:37:27 -0400
Subject: [PATCH 51/92] last commit was wrong - the CONSOLE accepts command
 string name, here we just need to pass in input and output

---
 tests/Titon/Console/InputTest.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Titon/Console/InputTest.hh b/tests/Titon/Console/InputTest.hh
index 5ce0e9f..1ccb3e3 100644
--- a/tests/Titon/Console/InputTest.hh
+++ b/tests/Titon/Console/InputTest.hh
@@ -15,7 +15,7 @@ class InputTest extends TestCase {
 
     public function setUp() {
         $this->input = new Input();
-        $this->input->addCommand('\Titon\Test\Stub\CommandStub');
+        $this->input->addCommand(new CommandStub($this->input, new Output()));
     }
 
     public function testParseFlags(): void {

From b380345dd32e09c062d34c813a99b8f5bd314171 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 10 Mar 2015 12:34:42 -0400
Subject: [PATCH 52/92] fixed failing test

---
 tests/Titon/Console/CommandTest.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Titon/Console/CommandTest.hh b/tests/Titon/Console/CommandTest.hh
index 2bbcb34..362a7fc 100644
--- a/tests/Titon/Console/CommandTest.hh
+++ b/tests/Titon/Console/CommandTest.hh
@@ -16,7 +16,7 @@ class CommandTest extends TestCase {
         });
         $args->addFlag(new Flag('help', 'Show this help screen'));
 
-        $command = new CommandStub();
+        $command = new CommandStub($args, new Output());
         $command->setInput($args);
         $command->configure();
         $command->registerInput();

From cd23e47ea37b61ed9d6c2b31d7d00d471a24e7b8 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 10 Mar 2015 18:41:56 -0400
Subject: [PATCH 53/92] reconstructed CommandStub to be a nice demo command
 that is fully functional to show all features of the package. fixed type
 errors, fixed issues related to commens from the PR, InputDefinitions no
 longer have defaults (pass in a default value in the getValue if desired),
 and more.

---
 tests/Titon/Test/Stub/Console/CommandStub.hh | 169 ++++++++++++++++++-
 1 file changed, 164 insertions(+), 5 deletions(-)

diff --git a/tests/Titon/Test/Stub/Console/CommandStub.hh b/tests/Titon/Test/Stub/Console/CommandStub.hh
index ed58b8f..39c87a0 100644
--- a/tests/Titon/Test/Stub/Console/CommandStub.hh
+++ b/tests/Titon/Test/Stub/Console/CommandStub.hh
@@ -1,19 +1,178 @@
 <?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
 
 namespace Titon\Test\Stub\Console;
 
 use Titon\Console\Command\AbstractCommand;
+use Titon\Console\Feedback\ProgressBar;
+use Titon\Console\Feedback\Wait;
+use Titon\Console\InputDefinition\Argument;
+use Titon\Console\InputDefinition\Option;
 use Titon\Console\InputDefinition\Flag;
+use Titon\Console\Tree\AsciiTree;
+use Titon\Console\Tree\MarkdownTree;
+use Titon\Console\Table\AsciiTable;
+use Titon\Console\UserInput\Menu;
 
 class CommandStub extends AbstractCommand {
 
-    public function configure() {
-        $this->setName('command');
-        $this->addFlag((new Flag('verbose', 'Set command verbosity'))
-            ->alias('v'));
+    public function configure(): void {
+        $this->setName('demo')->setDescription('Provide demos for all built in functionalities.');
+
+        $this->addFlag(new Flag('table', 'Output a nice sample table'));
+
+        $this->addOption(new Option('tree', 'Output either an `ascii` or `markdown` tree'));
+
+        $this->addFlag(new Flag('greet', 'Output a friendly greeting!'));
+        $this->addArgument(new Argument('name', 'The name of the person I am greeting.'));
+
+        $this->addOption(new Option('feedback', "Display either a `progress` bar or a `spinner`."));
+
+        $this->addFlag(new Flag('menu', 'Present a menu to help guide you through the examples.'));
+    }
+
+    public function run(): void {
+        if (($type = $this->getOption('tree', '')) !== '') {
+            invariant(is_string($type), "Must be a string.");
+            $this->runTreeExample($type);
+        } else if ($this->getFlag('table') === 1) {
+            $this->runTableExample();
+        } else if ($this->getFlag('greet')) {
+            if (($name = $this->getArgument('name', '')) !== '') {
+                $this->out(sprintf("Hello, %s!", $name));
+            } else {
+                $this->out("Hello, world!");
+            }
+        } else if (($type = $this->getOption('feedback', '')) !== '') {
+            invariant(is_string($type), "Must be a string.");
+            $this->runFeedbackExample($type);
+        } else if ($this->getFlag('menu')) {
+            $this->runUserInputExamples();
+        }
+    }
+
+    protected function runFeedbackExample(string $type): void {
+        if ($type === 'progress') {
+            $feedback = new ProgressBar(100, 'Please wait');
+        } else if ($type === 'spinner') {
+            $feedback = new Wait(100, 'Please wait ');
+        } else {
+            return;
+        }
+
+        for ($i = 0; $i < 100; $i++) {
+            $feedback->advance();
+            usleep(10000);
+        }
+        $feedback->finish();
     }
 
-    public function run() {
+    protected function runTableExample(): void {
+        $data = Vector{
+            Map {
+                'Company'          => 'Apple',
+                'Operating System' => 'Mac OS X',
+                'Latest Release'   => 'Yosemite',
+            },
+            Map {
+                'Company'          => 'Microsoft',
+                'Operating System' => 'Windows',
+                'Latest Release'   => '10',
+            },
+            Map {
+                'Company'          => 'RedHat',
+                'Operating System' => 'RHEL',
+                'Latest Release'   => '7',
+            },
+        };
+
+        $table = new AsciiTable();
+        $table->setData($data);
+
+        $this->out($table->render());
+    }
+
+    protected function runTreeExample(string $type): void {
+        $data = [
+            'Titon' => [
+                'Console' => [
+                    'Command',
+                    'Exception',
+                    'Feedback',
+                    'InputDefinition',
+                    'System',
+                    'Table',
+                    'Tree' => [
+                        'AbstractTree.hh',
+                        'AsciiTree.hh',
+                        'MarkdownTree.hh'
+                    ],
+                    'UserInput',
+                ],
+                0 => 'Utility'
+            ],
+        ];
+
+        if ($type === 'ascii') {
+            $tree = new AsciiTree($data);
+        } else if ($type === 'markdown') {
+            $tree = new MarkdownTree($data);
+        } else {
+            $this->error(sprintf("The table type %s is not supported.", $type));
+
+            return;
+        }
+
+        $this->out($tree->render());
+    }
+
+    protected function runUserInputExamples(): void {
+        $confirm = $this->confirm('y');
+        if (!$confirm->confirmed('<warning>Are you sure you want a menu?</warning>')) {
+            return;
+        }
+
+        $menu = $this->menu(Map {
+            "0" => 'ASCII Tree',
+            "1" => 'Markdown Tree',
+            "2" => 'Table',
+            "3" => 'Gretting',
+            "4" => 'Progress bar',
+            "5" => 'Spinner',
+            "6" => 'Repeat this menu',
+            "7" => 'Quit'
+        }, "Please select from the options below");
+        $answer = $menu->prompt("Enter a selection");
 
+        switch ((int)$answer) {
+            case 0:
+                $this->runTreeExample('ascii');
+                break;
+            case 1:
+                $this->runTreeExample('markdown');
+                break;
+            case 2:
+                $this->runTableExample();
+                break;
+            case 3:
+                $this->out("Hello, world!");
+                break;
+            case 4:
+                $this->runFeedbackExample('progress');
+                break;
+            case 5:
+                $this->runFeedbackExample('spinner');
+                break;
+            case 6;
+                $this->runUserInputExamples();
+                break;
+            default:
+                $this->out('<info>Bye!</info>');
+                return;
+        }
     }
 }
\ No newline at end of file

From 78b5dc4f075b632ae7cedb341e4e85c97c9d8d15 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 10 Mar 2015 18:42:35 -0400
Subject: [PATCH 54/92] lots of changes, see previous commit details...

---
 src/Titon/Console/Command/AbstractCommand.hh  | 39 +++++---------
 src/Titon/Console/Console.hh                  | 53 ++++++++++---------
 .../Exception/InvalidCommandException.hh      |  4 +-
 .../InvalidInputDefinitionException.hh        | 20 +++++++
 .../Exception/InvalidNumberOfArguments.hh     |  4 +-
 src/Titon/Console/Input.hh                    | 42 +++++++++++----
 src/Titon/Console/InputDefinition.hh          | 16 ++++++
 .../AbstractInputDefinition.hh                | 43 +++++----------
 src/Titon/Console/InputDefinition/Flag.hh     |  1 -
 src/Titon/Console/Output.hh                   | 15 +++++-
 src/Titon/Console/Table.hh                    | 20 +++++++
 src/Titon/Console/Table/AbstractTable.hh      | 20 +++----
 src/Titon/Console/Tree.hh                     |  4 +-
 src/Titon/Console/Tree/AbstractTree.hh        | 10 ++--
 src/Titon/Console/Tree/AsciiTree.hh           |  4 +-
 src/Titon/Console/Tree/MarkdownTree.hh        |  4 +-
 .../Console/UserInput/AbstractUserInput.hh    | 10 ++--
 src/Titon/Console/UserInput/Confirm.hh        | 29 ++++++----
 src/Titon/Console/UserInput/Menu.hh           |  4 +-
 src/Titon/Console/UserInput/Prompt.hh         |  2 +-
 tests/Titon/Console/CommandTest.hh            |  9 ++--
 tests/Titon/Console/InputTest.hh              | 22 ++++----
 22 files changed, 223 insertions(+), 152 deletions(-)
 create mode 100644 src/Titon/Console/Exception/InvalidInputDefinitionException.hh

diff --git a/src/Titon/Console/Command/AbstractCommand.hh b/src/Titon/Console/Command/AbstractCommand.hh
index 539eee9..824e5fa 100644
--- a/src/Titon/Console/Command/AbstractCommand.hh
+++ b/src/Titon/Console/Command/AbstractCommand.hh
@@ -14,6 +14,7 @@ use Titon\Console\Output;
 use Titon\Console\InputDefinition\Argument;
 use Titon\Console\InputDefinition\Flag;
 use Titon\Console\InputDefinition\Option;
+use Titon\Console\UserInput\Confirm;
 use Titon\Console\UserInput\Menu;
 use Titon\Console\UserInput\Prompt;
 
@@ -132,13 +133,13 @@ abstract class AbstractCommand implements Command {
      * @param Map<mixed, mixed> $choices    Accepted values
      * @param string $message               The message to display before the choices
      *
-     * @return \Titon\Console\UserInput\Menu
+     * @return \Titon\Console\UserInput\Confirm
      */
-    protected function confirm(Map<mixed, mixed> $choices, string $message = ''): Menu {
-        $menu = new Menu($this->input, $this->output);
-        $menu->setAcceptedValues($choices)->setMessage($message);
+    protected function confirm(string $default = ''): Confirm {
+        $confirm = new Confirm($this->input, $this->output);
+        $confirm->setDefault($default);
 
-        return $menu;
+        return $confirm;
     }
 
     /**
@@ -157,12 +158,8 @@ abstract class AbstractCommand implements Command {
      *
      * @return mixed
      */
-    protected function getArgument(string $key): ?string {
-        if ($argument = $this->input->getArgument($key)) {
-            return $argument->getValue();
-        }
-
-        return null;
+    protected function getArgument(string $key, ?string $default = null): ?string {
+        return $this->input->getArgument($key)->getValue($default);
     }
 
     /**
@@ -190,12 +187,8 @@ abstract class AbstractCommand implements Command {
      *
      * @return mixed
      */
-    protected function getFlag(string $key): ?int {
-        if ($flag = $this->input->getFlag($key)) {
-            return $flag->getValue();
-        }
-
-        return null;
+    protected function getFlag(string $key, ?int $default = null): ?int {
+        return $this->input->getFlag($key)->getValue($default);
     }
 
     /**
@@ -223,12 +216,8 @@ abstract class AbstractCommand implements Command {
      *
      * @return mixed
      */
-    protected function getOption(string $key): ?string {
-        if ($option = $this->input->getOption($key)) {
-            return $option->getValue();
-        }
-
-        return null;
+    protected function getOption(string $key, ?string $default = null): ?string {
+        return $this->input->getOption($key)->getValue($default);
     }
 
     /**
@@ -249,7 +238,7 @@ abstract class AbstractCommand implements Command {
      *
      * @return \Titon\Console\UserInput\Menu
      */
-    protected function menu(Map<mixed, mixed> $choices, string $message = ''): Menu {
+    protected function menu(Map<string, string> $choices, string $message = ''): Menu {
         $menu = new Menu($this->input, $this->output);
         $menu->setAcceptedValues($choices)->setMessage($message);
 
@@ -274,7 +263,7 @@ abstract class AbstractCommand implements Command {
      *
      * @return \Titon\Console\UserInput\Prompt
      */
-    protected function prompt(Map<mixed, mixed> $choices = Map {}, string $default = ''): Prompt {
+    protected function prompt(Map<string, string> $choices = Map {}, string $default = ''): Prompt {
         $prompt = new Prompt($this->input, $this->output);
         $prompt->setAcceptedValues($choices)->setDefault($default);
 
diff --git a/src/Titon/Console/Console.hh b/src/Titon/Console/Console.hh
index 6c2ea43..34e3beb 100644
--- a/src/Titon/Console/Console.hh
+++ b/src/Titon/Console/Console.hh
@@ -78,6 +78,9 @@ class Console {
      * settings.
      */
     protected function bootstrap(): void {
+        /*
+         * Add global flags
+         */
         $this->input->addFlag((new Flag('help', 'Display this help screen.'))
             ->alias('h'));
         $this->input->addFlag((new Flag('quiet', 'Suppress all output.'))
@@ -85,6 +88,13 @@ class Console {
         $this->input->addFlag((new Flag('verbose', 'Set the verbosity of the application\'s output.'))
             ->alias('v')
             ->setStackable(true));
+
+        /*
+         * Add default styles
+         */
+        $this->output->setStyle('info', new StyleDefinition('green'));
+        $this->output->setStyle('warning', new StyleDefinition('yellow'));
+        $this->output->setStyle('error', new StyleDefinition('red'));
     }
 
     /**
@@ -110,39 +120,32 @@ class Console {
         $command->registerInput();
         $this->input->parse();
 
-        if (!is_null($flag = $this->input->getFlag('help'))) {
-            invariant($flag instanceof Flag, "Must be a Flag.");
+        $flag = $this->input->getFlag('help');
 
-            if ($flag->getValue() === 1) {
-                $this->renderHelpScreen($command);
-            }
-        } else {
-            $flag = $this->input->getFlag('quiet');
+        if ($flag->getValue() === 1) {
+            $this->renderHelpScreen($command);
+            return;
+        }
 
-            $verbositySet = false;
-            if (!is_null($flag)) {
-                invariant($flag instanceof Flag, "Must be a Flag.");
+        $flag = $this->input->getFlag('quiet');
 
-                if (!is_null($verbosity = (int)$flag->getValue())) {
-                    $verbositySet = true;
-                    $this->output->setVerbosity($verbosity);
-                }
-            }
+        $verbositySet = false;
 
-            if ($verbositySet === false) {
-                $flag = $this->input->getFlag('verbose');
+        if ($flag->exists()) {
+            $verbositySet = true;
+            $this->output->setVerbosity(0);
+        }
 
-                if (!is_null($flag)) {
-                    invariant($flag instanceof Flag, "Must be a Flag.");
+        if ($verbositySet === false) {
+            $flag = $this->input->getFlag('verbose');
+            $verbosity = $flag->getValue(1);
 
-                    if (!is_null($verbosity = (int)$flag->getValue())) {
-                        $this->output->setVerbosity($verbosity);
-                    }
-                }
-            }
+            invariant(!is_null($verbosity), "Must not be null.");
 
-            $command->run();
+            $this->output->setVerbosity($verbosity);
         }
+
+        $command->run();
     }
 
     /**
diff --git a/src/Titon/Console/Exception/InvalidCommandException.hh b/src/Titon/Console/Exception/InvalidCommandException.hh
index 96032a8..65ea91d 100644
--- a/src/Titon/Console/Exception/InvalidCommandException.hh
+++ b/src/Titon/Console/Exception/InvalidCommandException.hh
@@ -7,13 +7,13 @@
 
 namespace Titon\Console\Exception;
 
-use RuntimeException;
+use OutOfBoundsException;
 
 /**
  * Exception thrown when the command used in the application doesn't exist.
  *
  * @package Titon\Console\Exception
  */
-class InvalidCommandException extends RuntimeException {
+class InvalidCommandException extends OutOfBoundsException {
 
 }
diff --git a/src/Titon/Console/Exception/InvalidInputDefinitionException.hh b/src/Titon/Console/Exception/InvalidInputDefinitionException.hh
new file mode 100644
index 0000000..0382e79
--- /dev/null
+++ b/src/Titon/Console/Exception/InvalidInputDefinitionException.hh
@@ -0,0 +1,20 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\Exception;
+
+use RuntimeException;
+
+/**
+ * Exception thrown when an `InputDefinition` is requested that hasn't been
+ * registered.
+ *
+ * @package Titon\Console\Exception
+ */
+class InvalidInputDefinitionException extends RuntimeException {
+
+}
\ No newline at end of file
diff --git a/src/Titon/Console/Exception/InvalidNumberOfArguments.hh b/src/Titon/Console/Exception/InvalidNumberOfArguments.hh
index 5eeaa04..55a0b72 100644
--- a/src/Titon/Console/Exception/InvalidNumberOfArguments.hh
+++ b/src/Titon/Console/Exception/InvalidNumberOfArguments.hh
@@ -7,7 +7,7 @@
 
 namespace Titon\Console\Exception;
 
-use RuntimeException;
+use InvalidArgumentException;
 
 /**
  * Exception thrown when parameters are passed in the input that do not belong
@@ -15,6 +15,6 @@ use RuntimeException;
  *
  * @package Titon\Console\Exception
  */
-class InvalidNumberOfArgumentsException extends RuntimeException {
+class InvalidNumberOfArgumentsException extends InvalidArgumentException {
 
 }
diff --git a/src/Titon/Console/Input.hh b/src/Titon/Console/Input.hh
index daf1e35..298b04f 100644
--- a/src/Titon/Console/Input.hh
+++ b/src/Titon/Console/Input.hh
@@ -15,6 +15,7 @@ use Titon\Console\InputDefinition\Option;
 use Titon\Console\Exception\MissingValueException;
 use Titon\Console\Exception\InvalidNumberOfCommandsException;
 use Titon\Console\Exception\InvalidNumberOfArgumentsException;
+use Titon\Console\Exception\InvalidInputDefinitionException;
 
 /**
  * The `Input` class contains all available `Flag`, `Argument`, `Option`, and
@@ -217,10 +218,16 @@ class Input {
      *
      * @param string $key The key or alias of the `Argument`
      *
-     * @return \Titon\Console\Argument|null
+     * @return \Titon\Console\Argument
      */
-    public function getArgument(string $key): ?Argument {
-        return $this->arguments->get($key);
+    public function getArgument(string $key): Argument {
+        if (is_null($argument = $this->arguments->get($key))) {
+            throw new InvalidInputDefinitionException(sprintf("The argument %s doesn't exist.", $key));
+        }
+
+        invariant($argument instanceof Argument, "Must be an `Argument`.");
+
+        return $argument;
     }
 
     /**
@@ -257,10 +264,16 @@ class Input {
      *
      * @param string $key The key or alias of the `Flag`
      *
-     * @return \Titon\Console\Flag|null
+     * @return \Titon\Console\Flag
      */
-    public function getFlag(string $key): ?Flag {
-        return $this->flags->get($key);
+    public function getFlag(string $key): Flag {
+        if (is_null($flag = $this->flags->get($key))) {
+            throw new InvalidInputDefinitionException(sprintf("The flag %s doesn't exist.", $key));
+        }
+
+        invariant($flag instanceof Flag, "Must be a `Flag`.");
+
+        return $flag;
     }
 
     /**
@@ -290,10 +303,16 @@ class Input {
      *
      * @param string $key The key or alias of the `Option`
      *
-     * @return \Titon\Console\Option|null
+     * @return \Titon\Console\Option
      */
-    public function getOption(string $key): ?Option {
-        return $this->options->get($key);
+    public function getOption(string $key): Option {
+        if (is_null($option = $this->options->get($key))) {
+            throw new InvalidInputDefinitionException(sprintf("The option %s doesn't exist.", $key));
+        }
+
+        invariant($option instanceof Option, "Must be an `Option`.");
+
+        return $option;
     }
 
     /**
@@ -409,6 +428,7 @@ class Input {
         foreach ($this->arguments as $argument) {
             if (is_null($argument->getValue())) {
                 $argument->setValue($input['raw']);
+                $argument->setExists(true);
 
                 return true;
             }
@@ -436,6 +456,8 @@ class Input {
                 $flag->setValue(1);
             }
 
+            $flag->setExists(true);
+
             return true;
         }
 
@@ -444,6 +466,7 @@ class Input {
                 invariant($flag instanceof Flag, "Must be a Flag.");
 
                 $flag->setValue(0);
+                $flag->setExists(true);
 
                 return true;
             }
@@ -490,6 +513,7 @@ class Input {
         }
 
         $option->setValue($value);
+        $option->setExists(true);
 
         return true;
     }
diff --git a/src/Titon/Console/InputDefinition.hh b/src/Titon/Console/InputDefinition.hh
index 1b9dcbd..fb56b1d 100644
--- a/src/Titon/Console/InputDefinition.hh
+++ b/src/Titon/Console/InputDefinition.hh
@@ -15,6 +15,13 @@ namespace Titon\Console;
  */
 interface InputDefinition {
 
+    /**
+     * Returns if the `InputDefinition` has been assigned a value by the parser.
+     *
+     * @return bool
+     */
+    public function exists(): bool;
+
     /**
      * Retrieve the alias of the `InputDefinition`.
      *
@@ -57,4 +64,13 @@ interface InputDefinition {
      * @return mixed
      */
     public function getValue(): mixed;
+
+    /**
+     * Set if the `InputDefinition` has been assigned a value.
+     *
+     * @param bool $exists  If a value exists
+     *
+     * @return $this
+     */
+    public function setExists(bool $exists): this;
 }
\ No newline at end of file
diff --git a/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh b/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
index 9d6a26d..e5769a8 100644
--- a/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
+++ b/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
@@ -28,18 +28,18 @@ abstract class AbstractInputDefinition<T> implements InputDefinition {
     protected string $alias = '';
 
     /**
-     * The default value given to the input if not specified by the user.
+     * The description of the input.
      *
-     * @var T|null
+     * @var string
      */
-    protected ?T $default;
+    protected string $description;
 
     /**
-     * The description of the input.
+     * Flag if the `InputDefinition` has been assigned a value.
      *
-     * @var string
+     * @var bool
      */
-    protected string $description;
+    protected bool $exists = false;
 
     /**
      * The mode of the input to determine if it should be required by the user.
@@ -87,12 +87,10 @@ abstract class AbstractInputDefinition<T> implements InputDefinition {
     }
 
     /**
-     * Method to return if the `InputDefinition` was specified by the user.
-     *
-     * @return bool
+     * {@inheritdoc}
      */
     public function exists(): bool {
-        return !is_null($this->value);
+        return $this->exists;
     }
 
     /**
@@ -104,15 +102,6 @@ abstract class AbstractInputDefinition<T> implements InputDefinition {
         return $this->alias;
     }
 
-    /**
-     * Retrieve the default value of the `InputDefinition`.
-     *
-     * @return mixed
-     */
-    public function getDefault(): ?T {
-        return $this->default;
-    }
-
     /**
      * Retrieve the description of the `InputDefinition`.
      *
@@ -159,14 +148,14 @@ abstract class AbstractInputDefinition<T> implements InputDefinition {
      * Retrieve the value as specified by the user for the `InputDefinition`. If
      * the user has not specified the value, the default value is returned.
      *
-     * @return mixed
+     * @return T|null
      */
-    public function getValue(): ?T {
+    public function getValue(?T $default = null): ?T {
         if (!is_null($this->value)) {
             return $this->value;
         }
 
-        return $this->default;
+        return $default;
     }
 
     /**
@@ -188,14 +177,10 @@ abstract class AbstractInputDefinition<T> implements InputDefinition {
     }
 
     /**
-     * Set the default value for the `Flag` if no value is give.
-     *
-     * @param int $default  The default value
-     *
-     * @return $this
+     * {@inheritdoc}
      */
-    public function setDefault(T $default): this {
-        $this->default = $default;
+    public function setExists(bool $exists): this {
+        $this->exists = $exists;
 
         return $this;
     }
diff --git a/src/Titon/Console/InputDefinition/Flag.hh b/src/Titon/Console/InputDefinition/Flag.hh
index b1ce2be..a7972b8 100644
--- a/src/Titon/Console/InputDefinition/Flag.hh
+++ b/src/Titon/Console/InputDefinition/Flag.hh
@@ -44,7 +44,6 @@ class Flag extends AbstractInputDefinition<int> {
             $this->negativeAlias = "no-$name";
         }
 
-        $this->default = 0;
         $this->stackable = $stackable;
     }
 
diff --git a/src/Titon/Console/Output.hh b/src/Titon/Console/Output.hh
index d139efc..573ec0f 100644
--- a/src/Titon/Console/Output.hh
+++ b/src/Titon/Console/Output.hh
@@ -73,6 +73,19 @@ class Output {
         }
     }
 
+    /**
+     * Remove a specific element's style.
+     *
+     * @param string $element   The element to remove
+     *
+     * @return $this
+     */
+    public function clearStyle(string $element): this {
+        $this->styles->remove($element);
+
+        return $this;
+    }
+
     /**
      * Send output to the error stream.
      *
@@ -178,7 +191,7 @@ class Output {
      * @param string          $element  The element to assign
      * @param StyleDefinition $format   The style to apply to the given tag
      */
-    public function setFormat(string $element, StyleDefinition $format): this {
+    public function setStyle(string $element, StyleDefinition $format): this {
         $this->styles[$element] = $format;
 
         return $this;
diff --git a/src/Titon/Console/Table.hh b/src/Titon/Console/Table.hh
index ea979b1..f42bbe4 100644
--- a/src/Titon/Console/Table.hh
+++ b/src/Titon/Console/Table.hh
@@ -31,6 +31,26 @@ interface Table {
      */
     public function render(): string;
 
+    /**
+     * Set the data of the table with a Vector of column name and value Maps.
+     * This method overwrites any existing rows in the table.
+     *
+     * @param Vector<Map<string, string>> $data A Vector containing Maps of column
+     *                                          name and data key-value pairs.
+     *
+     * @return $this
+     */
+    public function setData(Vector<Map<string, mixed>> $data): this;
+
+    /**
+     * Set the column names for the table.
+     *
+     * @param Vector<string> $headers   A Vector containing column names
+     *
+     * @return $this
+     */
+    public function setHeaders(Vector<mixed> $headers): this;
+
     /**
      * Set the data for the rows in the table with a Vector containing a Vector
      * for each row in the table.
diff --git a/src/Titon/Console/Table/AbstractTable.hh b/src/Titon/Console/Table/AbstractTable.hh
index a50b729..0857f11 100644
--- a/src/Titon/Console/Table/AbstractTable.hh
+++ b/src/Titon/Console/Table/AbstractTable.hh
@@ -63,7 +63,11 @@ abstract class AbstractTable implements Table {
     protected function setColumnWidths(Vector<mixed> $row): void {
         foreach ($row as $index => $value) {
             $width = strlen($value);
-            $currentWidth = $this->columnWidths[$index] ?: 0;
+
+            $currentWidth = 0;
+            if ($this->columnWidths->containsKey($index)) {
+                $currentWidth = $this->columnWidths[$index];
+            }
 
             if ($width > $currentWidth) {
                 if ($this->columnWidths->count() === $index) {
@@ -76,13 +80,7 @@ abstract class AbstractTable implements Table {
     }
 
     /**
-     * Set the data of the table with a Vector of column name and value Maps.
-     * This method overwrites any existing rows in the table.
-     *
-     * @param Vector<Map<string, string>> $data A Vector containing Maps of column
-     *                                          name and data key-value pairs.
-     *
-     * @return $this
+     * {@inheritdoc}
      */
     public function setData(Vector<Map<string, mixed>> $data): this {
         $rows = Vector {};
@@ -104,11 +102,7 @@ abstract class AbstractTable implements Table {
     }
 
     /**
-     * Set the column names for the table.
-     *
-     * @param Vector<string> $headers   A Vector containing column names
-     *
-     * @return $this
+     * {@inheritdoc}
      */
     public function setHeaders(Vector<mixed> $headers): this {
         $this->setColumnWidths($headers);
diff --git a/src/Titon/Console/Tree.hh b/src/Titon/Console/Tree.hh
index ee23b3e..695447a 100644
--- a/src/Titon/Console/Tree.hh
+++ b/src/Titon/Console/Tree.hh
@@ -19,7 +19,7 @@ interface Tree {
      *
      * @return array<mixed>
      */
-    public function getData(): Vector<mixed>;
+    public function getData(): array<mixed>;
 
     /**
      * Build and return the markup for the `Tree`.
@@ -35,5 +35,5 @@ interface Tree {
      *
      * @return $this
      */
-    public function setData(Vector<mixed> $data): this;
+    public function setData(array<mixed> $data): this;
 }
\ No newline at end of file
diff --git a/src/Titon/Console/Tree/AbstractTree.hh b/src/Titon/Console/Tree/AbstractTree.hh
index d885c7f..cff3cf4 100644
--- a/src/Titon/Console/Tree/AbstractTree.hh
+++ b/src/Titon/Console/Tree/AbstractTree.hh
@@ -22,14 +22,14 @@ abstract class AbstractTree implements Tree {
      *
      * @var array<mixed>
      */
-    protected Vector<mixed> $data = Vector {};
+    protected array<mixed> $data = [];
 
     /**
      * Construct a new instance of a tree.
      *
      * @param array<mixed> $data    The data to render
      */
-    public function __construct(Vector<mixed> $data = Vector {}) {
+    public function __construct(array<mixed> $data = []) {
         $this->data = $data;
     }
 
@@ -42,14 +42,14 @@ abstract class AbstractTree implements Tree {
      *
      * @retun string
      */
-    abstract protected function build(Vector<mixed> $tree, string $prefix = ''): string;
+    abstract protected function build(array<mixed> $tree, string $prefix = ''): string;
 
     /**
      * Retrieve the data of the tree.
      *
      * @return array<mixed>
      */
-    public function getData(): Vector<mixed> {
+    public function getData(): array<mixed> {
         return $this->data;
     }
 
@@ -65,7 +65,7 @@ abstract class AbstractTree implements Tree {
     /**
      * {@inheritdoc}
      */
-    public function setData(Vector<mixed> $data): this {
+    public function setData(array<mixed> $data): this {
         $this->data = $data;
 
         return $this;
diff --git a/src/Titon/Console/Tree/AsciiTree.hh b/src/Titon/Console/Tree/AsciiTree.hh
index 96b8e3b..8b6df55 100644
--- a/src/Titon/Console/Tree/AsciiTree.hh
+++ b/src/Titon/Console/Tree/AsciiTree.hh
@@ -17,7 +17,7 @@ class AsciiTree extends AbstractTree {
     /**
      * {@inheritdoc}
      */
-    protected function build(Vector<mixed> $tree, string $prefix = ''): string {
+    protected function build(array<mixed> $tree, string $prefix = ''): string {
         if (is_null($tree)) {
             $tree = $this->data;
         }
@@ -34,7 +34,7 @@ class AsciiTree extends AbstractTree {
             }
 
             $next = $branch[$i];
-            if ($next instanceof Vector) {
+            if (is_array($next)) {
                 $retval[] = $this->build($next, $prefix . ($i == $count - 1 ? '  ' : '| '));
             }
         }
diff --git a/src/Titon/Console/Tree/MarkdownTree.hh b/src/Titon/Console/Tree/MarkdownTree.hh
index 596dfc2..91f3b86 100644
--- a/src/Titon/Console/Tree/MarkdownTree.hh
+++ b/src/Titon/Console/Tree/MarkdownTree.hh
@@ -17,7 +17,7 @@ class MarkdownTree extends AbstractTree {
     /**
      * {@inheritdoc}
      */
-    protected function build(Vector<mixed> $tree, string $prefix = ''): string {
+    protected function build(array<mixed> $tree, string $prefix = ''): string {
         if (is_null($tree)) {
             $tree = $this->data;
         }
@@ -31,7 +31,7 @@ class MarkdownTree extends AbstractTree {
 
             $retval[] = "$prefix- $label";
 
-            if ($branch instanceof Vector) {
+            if (is_array($branch)) {
                 $retval[] = $this->build($branch, "$prefix  ");
             }
         }
diff --git a/src/Titon/Console/UserInput/AbstractUserInput.hh b/src/Titon/Console/UserInput/AbstractUserInput.hh
index 77fb14e..734e970 100644
--- a/src/Titon/Console/UserInput/AbstractUserInput.hh
+++ b/src/Titon/Console/UserInput/AbstractUserInput.hh
@@ -17,14 +17,14 @@ use Titon\Console\UserInput;
  *
  * @package Titon\Console\UserInput
  */
-abstract class AbstractUserInput implements UserInput {
+abstract class AbstractUserInput<T> implements UserInput {
 
     /**
      * Input values accepted to continue.
      *
-     * @var Map<mixed, mixed>
+     * @var Map<string, T>
      */
-    protected Map<mixed, mixed> $acceptedValues = Map {};
+    protected Map<string, T> $acceptedValues = Map {};
 
     /**
      * Default value if input given is empty.
@@ -65,11 +65,11 @@ abstract class AbstractUserInput implements UserInput {
     /**
      * Set the values accepted by the user.
      *
-     * @param Map<mixed, mixed> $choices    Accepted values
+     * @param Map<string, T> $choices    Accepted values
      *
      * @return $this
      */
-    public function setAcceptedValues(Map<mixed, mixed> $choices = Map {}): this {
+    public function setAcceptedValues(Map<string, T> $choices = Map {}): this {
         $this->acceptedValues = $choices;
 
         return $this;
diff --git a/src/Titon/Console/UserInput/Confirm.hh b/src/Titon/Console/UserInput/Confirm.hh
index 6589971..bd827de 100644
--- a/src/Titon/Console/UserInput/Confirm.hh
+++ b/src/Titon/Console/UserInput/Confirm.hh
@@ -7,9 +7,10 @@
 
 namespace Titon\Console\UserInput;
 
+use Titon\Console\Input;
 use Titon\Console\Output;
 
-class Confirm extends AbstractUserInput {
+class Confirm extends AbstractUserInput<bool> {
 
     /**
      * The message to be appened to the prompt message containing the accepted
@@ -19,6 +20,17 @@ class Confirm extends AbstractUserInput {
      */
     protected string $message = '';
 
+    public function __construct(Input $input, Output $output) {
+        parent::__construct($input, $output);
+
+        $this->acceptedValues = Map {
+            'y'   => true,
+            'yes' => true,
+            'n'   => false,
+            'no'  => false
+        };
+    }
+
     /**
      * Prompt the user for input and return the boolean value if the user has
      * confirmed or not.
@@ -29,16 +41,11 @@ class Confirm extends AbstractUserInput {
      */
     public function confirmed(string $message): bool {
         $input = $this->prompt($message);
+        $retval = $this->acceptedValues[strtolower($input)];
 
-        switch (strtolower($input)) {
-            case 'y':
-            case 'yes':
-                return true;
-            case 'n':
-            case 'no':
-            default:
-                return false;
-        }
+        invariant(is_bool($retval), "Must be a boolean value.");
+
+        return $retval;
     }
 
     /**
@@ -48,7 +55,7 @@ class Confirm extends AbstractUserInput {
         $message = "$message $this->message";
 
         do {
-            $this->output->out("$this->message ", Output::VERBOSITY_NORMAL, 0);
+            $this->output->out("$message ", Output::VERBOSITY_NORMAL, 0);
             $input = $this->input->getUserInput();
             if ($input === '' && $this->default !== '') {
                 $input = $this->default;
diff --git a/src/Titon/Console/UserInput/Menu.hh b/src/Titon/Console/UserInput/Menu.hh
index 7aaaeb5..242c485 100644
--- a/src/Titon/Console/UserInput/Menu.hh
+++ b/src/Titon/Console/UserInput/Menu.hh
@@ -15,7 +15,7 @@ use Titon\Console\Output;
  *
  * @package Titon\Console\UserInput
  */
-class Menu extends AbstractUserInput {
+class Menu extends AbstractUserInput<string> {
 
     /**
      * The message to present at the prompt.
@@ -41,7 +41,7 @@ class Menu extends AbstractUserInput {
         $this->output->out();
 
         while (true) {
-            $this->output->out("$prompt: ", Output::VERBOSITY_NORMAL, 0);
+            $this->output->out("$prompt ", Output::VERBOSITY_NORMAL, 0);
             $input = $this->input->getUserInput();
 
             if (is_numeric($input)) {
diff --git a/src/Titon/Console/UserInput/Prompt.hh b/src/Titon/Console/UserInput/Prompt.hh
index 027b605..270957b 100644
--- a/src/Titon/Console/UserInput/Prompt.hh
+++ b/src/Titon/Console/UserInput/Prompt.hh
@@ -15,7 +15,7 @@ use Titon\Console\Output;
  *
  * @package Titon\Console\UserInput
  */
-class Prompt extends AbstractUserInput {
+class Prompt extends AbstractUserInput<string> {
 
     /**
      * If the prompt is set to show value hints, this string contains those hints
diff --git a/tests/Titon/Console/CommandTest.hh b/tests/Titon/Console/CommandTest.hh
index 362a7fc..0cfc102 100644
--- a/tests/Titon/Console/CommandTest.hh
+++ b/tests/Titon/Console/CommandTest.hh
@@ -12,9 +12,8 @@ class CommandTest extends TestCase {
 
     public function testAddArguments(): void {
         $args = new Input(Vector {
-            '-v'
+            '--table'
         });
-        $args->addFlag(new Flag('help', 'Show this help screen'));
 
         $command = new CommandStub($args, new Output());
         $command->setInput($args);
@@ -23,7 +22,9 @@ class CommandTest extends TestCase {
 
         $args->parse();
 
-        $this->assertEquals(2, count($args->getFlags()));
-        $this->assertEquals(1, $args->getFlag('v')->getValue());
+        $this->assertEquals(3, count($args->getFlags()));
+        $this->assertEquals(2, count($args->getOptions()));
+        $this->assertEquals(1, count($args->getArguments()));
+        $this->assertEquals(1, $args->getFlag('table')->getValue());
     }
 }
\ No newline at end of file
diff --git a/tests/Titon/Console/InputTest.hh b/tests/Titon/Console/InputTest.hh
index 1ccb3e3..15bd92c 100644
--- a/tests/Titon/Console/InputTest.hh
+++ b/tests/Titon/Console/InputTest.hh
@@ -23,7 +23,7 @@ class InputTest extends TestCase {
          * Check basic flag
          */
         $this->input->setInput(Vector {
-            'command',
+            'demo',
             '--foo'
         });
         $this->input->addFlag((new Flag('foo'))->alias('f'));
@@ -33,7 +33,7 @@ class InputTest extends TestCase {
         $this->assertEquals(1, $this->input->getFlag('f')->getValue());
 
         $this->input->setInput(Vector {
-            'command',
+            'demo',
             '-f'
         });
         $this->input->addFlag((new Flag('foo'))->alias('f'));
@@ -46,7 +46,7 @@ class InputTest extends TestCase {
          * Check stacked, but different, flags
          */
         $this->input->setInput(Vector {
-            'command',
+            'demo',
             '-fb'
         });
         $this->input->addFlag((new Flag('foo'))->alias('f'));
@@ -60,7 +60,7 @@ class InputTest extends TestCase {
          * Check stacked flag
          */
         $this->input->SetInput(Vector {
-            'command',
+            'demo',
             '-vvv'
         });
         $this->input->addFlag((new Flag('v'))->setStackable(true));
@@ -83,7 +83,7 @@ class InputTest extends TestCase {
 
     public function testParseOptions(): void {
         $this->input->setInput(Vector {
-            'command',
+            'demo',
             '--name',
             'Alex Phillips'
         });
@@ -97,7 +97,7 @@ class InputTest extends TestCase {
         $this->input->setInput(Vector {
             '--name',
             'Alex Phillips',
-            'command'
+            'demo'
         });
         $this->input->addOption((new Option('name'))->alias('n'));
         $this->input->addArgument(new Argument('bar', 'Bar!'));
@@ -107,7 +107,7 @@ class InputTest extends TestCase {
         $this->assertEquals('Alex Phillips', $this->input->getOption('n')->getValue());
 
         $this->input->setInput(Vector {
-            'command',
+            'demo',
             '-n',
             'Alex Phillips'
         });
@@ -119,7 +119,7 @@ class InputTest extends TestCase {
         $this->assertEquals('Alex Phillips', $this->input->getOption('n')->getValue());
 
         $this->input->setInput(Vector {
-            'command',
+            'demo',
             '--name="Alex Phillips"'
         });
         $this->input->addOption((new Option('name'))->alias('n'));
@@ -132,7 +132,7 @@ class InputTest extends TestCase {
 
     public function testParseArguments(): void {
         $this->input->setInput(Vector {
-            'command',
+            'demo',
             'Alex Phillips'
         });
         $this->input->addArgument(new Argument('name'));
@@ -144,7 +144,7 @@ class InputTest extends TestCase {
 
     public function testMixedArguments(): void {
         $this->input->setInput(Vector {
-            'command',
+            'demo',
             'Alex Phillips',
             '-fb',
             '--baz="woot"'
@@ -157,7 +157,7 @@ class InputTest extends TestCase {
         $this->input->getActiveCommand();
         $this->input->parse();
 
-        $this->assertEquals('command', $this->input->getActiveCommand()->getName());
+        $this->assertEquals('demo', $this->input->getActiveCommand()->getName());
         $this->assertEquals('Alex Phillips', $this->input->getArgument('name')->getValue());
         $this->assertEquals(1, $this->input->getFlag('foo')->getValue());
         $this->assertEquals(1, $this->input->getFlag('f')->getValue());

From 98469263113aac47e5bdaf361b806be3a9f41dab Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 10 Mar 2015 18:50:10 -0400
Subject: [PATCH 55/92] moved class constants to interface

---
 src/Titon/Console/HelpScreen.hh                             | 6 +++---
 src/Titon/Console/Input.hh                                  | 6 +++---
 src/Titon/Console/InputDefinition.hh                        | 3 +++
 .../Console/InputDefinition/AbstractInputDefinition.hh      | 3 ---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Titon/Console/HelpScreen.hh b/src/Titon/Console/HelpScreen.hh
index c73de3c..4851cb2 100644
--- a/src/Titon/Console/HelpScreen.hh
+++ b/src/Titon/Console/HelpScreen.hh
@@ -269,7 +269,7 @@ class HelpScreen {
                     $arg .= "|" . $argument->getFormattedName($argument->getAlias());
                 }
 
-                if ($argument->getMode() === AbstractInputDefinition::MODE_OPTIONAL) {
+                if ($argument->getMode() === InputDefinition::MODE_OPTIONAL) {
                     $usage[] = "[$arg]";
                 }
             }
@@ -279,7 +279,7 @@ class HelpScreen {
                     $arg .= "|" . $argument->getFormattedName($argument->getAlias());
                 }
 
-                if ($argument->getMode() === AbstractInputDefinition::MODE_OPTIONAL) {
+                if ($argument->getMode() === InputDefinition::MODE_OPTIONAL) {
                     $usage[] = "[$arg]";
                 }
             }
@@ -290,7 +290,7 @@ class HelpScreen {
                 }
 
                 $arg = "$arg=\"...\"";
-                if ($argument->getMode() === AbstractInputDefinition::MODE_OPTIONAL) {
+                if ($argument->getMode() === InputDefinition::MODE_OPTIONAL) {
                     $usage[] = "[$arg]";
                 }
             }
diff --git a/src/Titon/Console/Input.hh b/src/Titon/Console/Input.hh
index 298b04f..f4cc1ef 100644
--- a/src/Titon/Console/Input.hh
+++ b/src/Titon/Console/Input.hh
@@ -384,7 +384,7 @@ class Input {
         }
 
         foreach ($this->flags as $name => $flag) {
-            if ($flag->getMode() !== AbstractInputDefinition::MODE_REQUIRED) {
+            if ($flag->getMode() !== InputDefinition::MODE_REQUIRED) {
                 continue;
             }
 
@@ -394,7 +394,7 @@ class Input {
         }
 
         foreach ($this->options as $name => $option) {
-            if ($option->getMode() !== AbstractInputDefinition::MODE_REQUIRED) {
+            if ($option->getMode() !== InputDefinition::MODE_REQUIRED) {
                 continue;
             }
 
@@ -404,7 +404,7 @@ class Input {
         }
 
         foreach ($this->arguments as $name => $argument) {
-            if ($argument->getMode() !== AbstractInputDefinition::MODE_REQUIRED) {
+            if ($argument->getMode() !== InputDefinition::MODE_REQUIRED) {
                 continue;
             }
 
diff --git a/src/Titon/Console/InputDefinition.hh b/src/Titon/Console/InputDefinition.hh
index fb56b1d..ea6f6b8 100644
--- a/src/Titon/Console/InputDefinition.hh
+++ b/src/Titon/Console/InputDefinition.hh
@@ -15,6 +15,9 @@ namespace Titon\Console;
  */
 interface InputDefinition {
 
+    const int MODE_OPTIONAL = 0;
+    const int MODE_REQUIRED = 1;
+
     /**
      * Returns if the `InputDefinition` has been assigned a value by the parser.
      *
diff --git a/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh b/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
index e5769a8..d83d6e4 100644
--- a/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
+++ b/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
@@ -17,9 +17,6 @@ use Titon\Console\InputDefinition;
  */
 abstract class AbstractInputDefinition<T> implements InputDefinition {
 
-    const int MODE_OPTIONAL = 0;
-    const int MODE_REQUIRED = 1;
-
     /**
      * An alternate notation to specify the input as.
      *

From 2d7f88faccc180b649357ffa6cbb83ed14240ad8 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 10 Mar 2015 20:03:25 -0400
Subject: [PATCH 56/92] composer update ran

---
 composer.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.lock b/composer.lock
index bf69e55..bba84f6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "dde9674c4d150161fe077a664cda7a71",
+    "hash": "bd8e468c07936af55d25e2a9804f3961",
     "packages": [
         {
             "name": "psr/http-message",

From 1546bd99ccad38e7b934bf0d1970b1177a73a590 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 10 Mar 2015 20:06:36 -0400
Subject: [PATCH 57/92] fixed missing return type

---
 src/Titon/Console/System/SystemFactory.hh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Titon/Console/System/SystemFactory.hh b/src/Titon/Console/System/SystemFactory.hh
index ee2a16f..6f37d5e 100644
--- a/src/Titon/Console/System/SystemFactory.hh
+++ b/src/Titon/Console/System/SystemFactory.hh
@@ -7,6 +7,8 @@
 
 namespace Titon\Console\System;
 
+use Titon\Console\System;
+
 /**
  * Factory class for returning the proper `System` based on the operating system
  * the application is running on.
@@ -18,9 +20,9 @@ class SystemFactory {
     /**
      * Return the proper `System` class based on the system's operating system.
      *
-     * @return \Titon\Console\System\Linux|\Titon\Console\System\Windows
+     * @return \Titon\Console\System
      */
-    public static function factory() {
+    public static function factory(): System {
         if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
             return new Windows();
         }

From 72ba9dafb36a7a9bec1a048ac48e73faa8e3fe04 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 10 Mar 2015 20:12:28 -0400
Subject: [PATCH 58/92] added missing docblock

---
 src/Titon/Console/StyleDefinition.hh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Titon/Console/StyleDefinition.hh b/src/Titon/Console/StyleDefinition.hh
index a9c910e..dd2c608 100644
--- a/src/Titon/Console/StyleDefinition.hh
+++ b/src/Titon/Console/StyleDefinition.hh
@@ -21,6 +21,11 @@ class StyleDefinition {
      */
     private string $bgColor;
 
+    /**
+     * Data structure containing available background colors.
+     *
+     * @var Map<string, int>
+     */
     protected Map<string, int> $bgColorsMap = Map {
         'black'   => 40,
         'red'     => 41,

From e3e9939ffa4f69376335f5aa216bdf752e9c0965 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 10 Mar 2015 21:30:16 -0400
Subject: [PATCH 59/92] alias methods added to AbstractCommand for Feedback
 classes

---
 src/Titon/Console/Command/AbstractCommand.hh   | 10 ++++++++++
 src/Titon/Console/Feedback/AbstractFeedback.hh | 15 ++++++++++-----
 src/Titon/Console/Feedback/ProgressBar.hh      | 17 ++++-------------
 src/Titon/Console/Feedback/Wait.hh             | 13 +++++++------
 tests/Titon/Test/Stub/Console/CommandStub.hh   |  5 ++---
 5 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/Titon/Console/Command/AbstractCommand.hh b/src/Titon/Console/Command/AbstractCommand.hh
index 824e5fa..5781f56 100644
--- a/src/Titon/Console/Command/AbstractCommand.hh
+++ b/src/Titon/Console/Command/AbstractCommand.hh
@@ -7,6 +7,8 @@
 
 namespace Titon\Console\Command;
 
+use Titon\Console\Feedback\ProgressBar;
+use Titon\Console\Feedback\Wait;
 use Titon\Console\InputBag;
 use Titon\Console\Command;
 use Titon\Console\Input;
@@ -254,6 +256,10 @@ abstract class AbstractCommand implements Command {
         $this->output->out($output);
     }
 
+    protected function progressBar(int $total = 0, string $message = '', int $interval = 100): ProgressBar {
+        return new ProgressBar($this->output, $total, $message, $interval);
+    }
+
     /**
      * Construct and return a new `Prompt` object given the accepted choices and
      * default value.
@@ -330,4 +336,8 @@ abstract class AbstractCommand implements Command {
 
         return $this;
     }
+
+    protected function wait(int $total = 0, string $message = '', int $interval = 100): Wait {
+        return new  Wait($this->output, $total, $message, $interval);
+    }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/Feedback/AbstractFeedback.hh b/src/Titon/Console/Feedback/AbstractFeedback.hh
index 42941e9..41e5445 100644
--- a/src/Titon/Console/Feedback/AbstractFeedback.hh
+++ b/src/Titon/Console/Feedback/AbstractFeedback.hh
@@ -37,7 +37,7 @@ abstract class AbstractFeedback implements Feedback {
      *
      * @var string
      */
-    protected string $format = '{:prefix}{:feedback}{:suffix}';
+    protected string $format = '{prefix}{feedback}{suffix}';
 
     /**
      * The current iteration of the feedback used to calculate the speed.
@@ -79,7 +79,7 @@ abstract class AbstractFeedback implements Feedback {
      *
      * @var string
      */
-    protected string $prefix = '{:message}  {:percent}% [';
+    protected string $prefix = '{message}  {percent}% [';
 
     /**
      * The current speed of the feedback.
@@ -100,7 +100,7 @@ abstract class AbstractFeedback implements Feedback {
      *
      * @var string
      */
-    protected string $suffix = '] {:elapsed} / {:estimated}';
+    protected string $suffix = '] {elapsed} / {estimated}';
 
     /**
      * The current tick used to calculate the speed.
@@ -130,8 +130,8 @@ abstract class AbstractFeedback implements Feedback {
      * @param string $message   The message to be displayed with the feedback
      * @param int    $interval  The interval the feedback should update in
      */
-    public function __construct(int $total = 0, string $message = '', int $interval = 100) {
-        $this->output = Output::getInstance();
+    public function __construct(Output $output, int $total = 0, string $message = '', int $interval = 100) {
+        $this->output = $output;
         $this->message = $message;
         $this->interval = $interval;
         $this->setTotal($total);
@@ -146,6 +146,11 @@ abstract class AbstractFeedback implements Feedback {
         if ($this->shouldUpdate()) {
             $this->display();
         }
+
+        if ($this->current === $this->total) {
+            $this->display(true);
+            $this->output->out();
+        }
     }
 
     /**
diff --git a/src/Titon/Console/Feedback/ProgressBar.hh b/src/Titon/Console/Feedback/ProgressBar.hh
index be1dd85..9b28fe3 100644
--- a/src/Titon/Console/Feedback/ProgressBar.hh
+++ b/src/Titon/Console/Feedback/ProgressBar.hh
@@ -7,6 +7,7 @@
 
 namespace Titon\Console\Feedback;
 
+use Titon\Utility\Str;
 use Titon\Console\Output;
 use Titon\Console\System\SystemFactory;
 use Titon\Console\Exception\InvalidCharacterSequence;
@@ -30,16 +31,6 @@ class ProgressBar extends AbstractFeedback {
         '>'
     };
 
-    /**
-     * {@inheritdoc}
-     */
-    protected string $prefix = '{:message}  {:percent}% [';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected string $suffix = '] {:elapsed} / {:estimated}';
-
     /**
      * {@inheritdoc}
      */
@@ -49,8 +40,8 @@ class ProgressBar extends AbstractFeedback {
 
         // Need to make prefix and suffix before the bar so we know how long
         // to render it.
-        $prefix = $this->format($this->prefix, $variables);
-        $suffix = $this->format($this->suffix, $variables);
+        $prefix = Str::insert($this->prefix, $variables);
+        $suffix = Str::insert($this->suffix, $variables);
 
         $size = SystemFactory::factory()->getWidth();
         $size -= strlen($prefix . $suffix);
@@ -68,7 +59,7 @@ class ProgressBar extends AbstractFeedback {
             'suffix'   => $suffix
         };
 
-        $this->output->out($this->format($this->format, $variables), Output::VERBOSITY_NORMAL, 1, Output::CR);
+        $this->output->out(Str::insert($this->format, $variables, Map {'escape' => false}), Output::VERBOSITY_NORMAL, 1, Output::CR);
     }
 
     /**
diff --git a/src/Titon/Console/Feedback/Wait.hh b/src/Titon/Console/Feedback/Wait.hh
index 94257bd..82ee83a 100644
--- a/src/Titon/Console/Feedback/Wait.hh
+++ b/src/Titon/Console/Feedback/Wait.hh
@@ -7,6 +7,7 @@
 
 namespace Titon\Console\Feedback;
 
+use Titon\Utility\Str;
 use Titon\Console\Output;
 use Titon\Console\System\SystemFactory;
 
@@ -30,7 +31,7 @@ class Wait extends AbstractFeedback {
     /**
      * {@inheritdoc}
      */
-    protected string $prefix = " {:message}";
+    protected string $prefix = " {message}";
 
     /**
      * {@inheritdoc}
@@ -40,8 +41,8 @@ class Wait extends AbstractFeedback {
     /**
      * {@inheritdoc}
      */
-    public function __construct(int $total = 0, string $message = '', int $interval = 100) {
-        parent::__construct($total, $message, $interval);
+    public function __construct(Output $output, int $total = 0, string $message = '', int $interval = 100) {
+        parent::__construct($output, $total, $message, $interval);
         $this->iteration = 0;
     }
 
@@ -54,8 +55,8 @@ class Wait extends AbstractFeedback {
         $index = $this->iteration++ % $this->characterSequence->count();
         $feedback = str_pad($this->characterSequence[$index], $this->maxLength + 1);
 
-        $prefix = $this->format($this->prefix, $variables);
-        $suffix = $this->format($this->suffix, $variables);
+        $prefix = Str::insert($this->prefix, $variables);
+        $suffix = Str::insert($this->suffix, $variables);
 
         $variables = Map {
             'prefix'   => $prefix,
@@ -64,7 +65,7 @@ class Wait extends AbstractFeedback {
         };
 
         $this->output->out(
-            str_pad($this->format(
+            str_pad(Str::insert(
                 $this->format, $variables
             ), SystemFactory::factory()->getWidth()),
             1,
diff --git a/tests/Titon/Test/Stub/Console/CommandStub.hh b/tests/Titon/Test/Stub/Console/CommandStub.hh
index 39c87a0..2a8395e 100644
--- a/tests/Titon/Test/Stub/Console/CommandStub.hh
+++ b/tests/Titon/Test/Stub/Console/CommandStub.hh
@@ -57,9 +57,9 @@ class CommandStub extends AbstractCommand {
 
     protected function runFeedbackExample(string $type): void {
         if ($type === 'progress') {
-            $feedback = new ProgressBar(100, 'Please wait');
+            $feedback = $this->progressBar(100, 'Please wait');
         } else if ($type === 'spinner') {
-            $feedback = new Wait(100, 'Please wait ');
+            $feedback = $this->wait(100, 'Please wait ');
         } else {
             return;
         }
@@ -68,7 +68,6 @@ class CommandStub extends AbstractCommand {
             $feedback->advance();
             usleep(10000);
         }
-        $feedback->finish();
     }
 
     protected function runTableExample(): void {

From f11dc7f0b33a45850c89be4f06549bf5eb7d423a Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 10 Mar 2015 21:58:42 -0400
Subject: [PATCH 60/92] replaced format function with Str::insert

---
 .../Console/Feedback/AbstractFeedback.hh      | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/src/Titon/Console/Feedback/AbstractFeedback.hh b/src/Titon/Console/Feedback/AbstractFeedback.hh
index 41e5445..a3065f4 100644
--- a/src/Titon/Console/Feedback/AbstractFeedback.hh
+++ b/src/Titon/Console/Feedback/AbstractFeedback.hh
@@ -208,26 +208,6 @@ abstract class AbstractFeedback implements Feedback {
         $this->output->out();
     }
 
-    /**
-     * Format the given template to replace denoted variables with their values.
-     *
-     * @param string $message   The template to format
-     * @param        Map $      The variables available
-     *
-     * @return string
-     */
-    protected function format(string $message, Map<string, mixed> $args = Map {}): string {
-        if ($args->isEmpty()) {
-            return $message;
-        }
-
-        foreach ($args as $key => $value) {
-            $message = str_replace('{:' . $key . '}', $value, $message);
-        }
-
-        return $message;
-    }
-
     /**
      * Format the given time for output.
      *

From 2c54dbffc272997100114e6566ad048b7d9f758f Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 10 Mar 2015 22:12:35 -0400
Subject: [PATCH 61/92] go home whitespace, yer drunk

---
 src/Titon/Console/Exception/InvalidCharacterSequence.hh         | 2 +-
 src/Titon/Console/Exception/InvalidCommandException.hh          | 2 +-
 src/Titon/Console/Exception/InvalidNumberOfArguments.hh         | 2 +-
 src/Titon/Console/Exception/InvalidNumberOfCommandsException.hh | 2 +-
 src/Titon/Console/Exception/MissingValueException.hh            | 2 +-
 src/Titon/Console/Feedback/AbstractFeedback.hh                  | 2 +-
 src/Titon/Console/Input.hh                                      | 2 +-
 src/Titon/Console/bootstrap.hh                                  | 2 +-
 src/Titon/Console/composer.json                                 | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Titon/Console/Exception/InvalidCharacterSequence.hh b/src/Titon/Console/Exception/InvalidCharacterSequence.hh
index 1c2f2ca..19db566 100644
--- a/src/Titon/Console/Exception/InvalidCharacterSequence.hh
+++ b/src/Titon/Console/Exception/InvalidCharacterSequence.hh
@@ -17,4 +17,4 @@ use RuntimeException;
  */
 class InvalidCharacterSequence extends RuntimeException {
 
-}
+}
\ No newline at end of file
diff --git a/src/Titon/Console/Exception/InvalidCommandException.hh b/src/Titon/Console/Exception/InvalidCommandException.hh
index 65ea91d..947e669 100644
--- a/src/Titon/Console/Exception/InvalidCommandException.hh
+++ b/src/Titon/Console/Exception/InvalidCommandException.hh
@@ -16,4 +16,4 @@ use OutOfBoundsException;
  */
 class InvalidCommandException extends OutOfBoundsException {
 
-}
+}
\ No newline at end of file
diff --git a/src/Titon/Console/Exception/InvalidNumberOfArguments.hh b/src/Titon/Console/Exception/InvalidNumberOfArguments.hh
index 55a0b72..240acf5 100644
--- a/src/Titon/Console/Exception/InvalidNumberOfArguments.hh
+++ b/src/Titon/Console/Exception/InvalidNumberOfArguments.hh
@@ -17,4 +17,4 @@ use InvalidArgumentException;
  */
 class InvalidNumberOfArgumentsException extends InvalidArgumentException {
 
-}
+}
\ No newline at end of file
diff --git a/src/Titon/Console/Exception/InvalidNumberOfCommandsException.hh b/src/Titon/Console/Exception/InvalidNumberOfCommandsException.hh
index dc1ac53..a5b052e 100644
--- a/src/Titon/Console/Exception/InvalidNumberOfCommandsException.hh
+++ b/src/Titon/Console/Exception/InvalidNumberOfCommandsException.hh
@@ -17,4 +17,4 @@ use RuntimeException;
  */
 class InvalidNumberOfCommandsException extends RuntimeException {
 
-}
+}
\ No newline at end of file
diff --git a/src/Titon/Console/Exception/MissingValueException.hh b/src/Titon/Console/Exception/MissingValueException.hh
index e842742..5e00646 100644
--- a/src/Titon/Console/Exception/MissingValueException.hh
+++ b/src/Titon/Console/Exception/MissingValueException.hh
@@ -17,4 +17,4 @@ use RuntimeException;
  */
 class MissingValueException extends RuntimeException {
 
-}
+}
\ No newline at end of file
diff --git a/src/Titon/Console/Feedback/AbstractFeedback.hh b/src/Titon/Console/Feedback/AbstractFeedback.hh
index a3065f4..5cfc19e 100644
--- a/src/Titon/Console/Feedback/AbstractFeedback.hh
+++ b/src/Titon/Console/Feedback/AbstractFeedback.hh
@@ -375,4 +375,4 @@ abstract class AbstractFeedback implements Feedback {
 
         return false;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Titon/Console/Input.hh b/src/Titon/Console/Input.hh
index f4cc1ef..6dd3203 100644
--- a/src/Titon/Console/Input.hh
+++ b/src/Titon/Console/Input.hh
@@ -546,4 +546,4 @@ class Input {
 
         return $this;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Titon/Console/bootstrap.hh b/src/Titon/Console/bootstrap.hh
index 21fd329..70456b7 100644
--- a/src/Titon/Console/bootstrap.hh
+++ b/src/Titon/Console/bootstrap.hh
@@ -27,4 +27,4 @@ namespace Titon\Console {
         'value' => string
     );
     type StyleMap = Map<string, StyleDefinition>;
-}
+}
\ No newline at end of file
diff --git a/src/Titon/Console/composer.json b/src/Titon/Console/composer.json
index f971e13..8a0b2a8 100644
--- a/src/Titon/Console/composer.json
+++ b/src/Titon/Console/composer.json
@@ -31,4 +31,4 @@
       "src/Titon/Console/bootstrap.hh"
     ]
   }
-}
+}
\ No newline at end of file

From 438f8c807f2cc1652945535bcec980c57ab4e3d9 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Wed, 11 Mar 2015 06:27:37 -0400
Subject: [PATCH 62/92] throwing exception when an option has no value

---
 src/Titon/Console/Input.hh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Titon/Console/Input.hh b/src/Titon/Console/Input.hh
index 6dd3203..82c73c9 100644
--- a/src/Titon/Console/Input.hh
+++ b/src/Titon/Console/Input.hh
@@ -492,7 +492,9 @@ class Input {
         invariant(!is_null($option), "Must not be null.");
 
         // Peak ahead to make sure we get a value.
-        $nextValue = $this->input->peek();
+        if (is_null($nextValue = $this->input->peek())) {
+            throw new MissingValueException(sprintf("No value given for the option %s.", $input['value']));
+        }
 
         invariant(!is_null($nextValue), "Must be RawInput.");
 

From fdeba82609e6ed2a82b89ac498a377a066f9bd25 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Wed, 11 Mar 2015 21:05:06 -0400
Subject: [PATCH 63/92] honoring if ANSI is supported or not

---
 src/Titon/Console/Output.hh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Titon/Console/Output.hh b/src/Titon/Console/Output.hh
index 573ec0f..7e7dc8c 100644
--- a/src/Titon/Console/Output.hh
+++ b/src/Titon/Console/Output.hh
@@ -7,6 +7,8 @@
 
 namespace Titon\Console;
 
+use Titon\Console\System\SystemFactory;
+
 /**
  * The `Output` class handles formatting and sending data to the ouput stream.
  *
@@ -121,7 +123,11 @@ class Output {
                 $retval = $style->format($xmlTag, $retval);
                 $matches = [];
                 $retval = preg_replace_callback('#<[\w-]+?>.*<\/[\w-]+?>#', ($matches) ==> {
-                    return sprintf("%s%s%s", $style->getEndCode(), $this->format($matches[0]), $style->getStartCode());
+                    if (SystemFactory::factory()->supportsAnsi() === true) {
+                        return sprintf("%s%s%s", $style->getEndCode(), $this->format($matches[0]), $style->getStartCode());
+                    }
+
+                    return sprintf("%s", $this->format($matches[0]));
                 }, $retval);
             }
         }

From 4b168bbf83c3d53f530098a40a8f3851b2705617 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Wed, 11 Mar 2015 22:06:36 -0400
Subject: [PATCH 64/92] honoring ANSI support flags on output, altered
 HelpScreen to pass in the console for access to the application information
 (name, version etc.), added basic exception rendering for exceptions thrown
 in user-generated commands

---
 src/Titon/Console/Console.hh                  | 132 +++++++++++++++++-
 .../Console/Feedback/AbstractFeedback.hh      |   1 -
 src/Titon/Console/Feedback/ProgressBar.hh     |   7 +-
 src/Titon/Console/Feedback/Wait.hh            |   7 +-
 src/Titon/Console/HelpScreen.hh               |  39 ++++--
 src/Titon/Console/Input.hh                    |  14 +-
 src/Titon/Console/Output.hh                   |  29 +++-
 src/Titon/Console/StyleDefinition.hh          |  34 ++---
 8 files changed, 214 insertions(+), 49 deletions(-)

diff --git a/src/Titon/Console/Console.hh b/src/Titon/Console/Console.hh
index 34e3beb..d2b02f7 100644
--- a/src/Titon/Console/Console.hh
+++ b/src/Titon/Console/Console.hh
@@ -7,6 +7,7 @@
 
 namespace Titon\Console;
 
+use Exception;
 use Titon\Console\Input;
 use Titon\Console\Output;
 use Titon\Console\InputDefinition\Flag;
@@ -20,6 +21,13 @@ use ReflectionClass;
  */
 class Console {
 
+    /**
+     * A decorator banner to `brand` the application.
+     *
+     * @var string
+     */
+    protected string $banner = '';
+
     /**
      * The `Command` object to run
      *
@@ -34,6 +42,13 @@ class Console {
      */
     protected Input $input;
 
+    /**
+     * The name of the application.
+     *
+     * @var string
+     */
+    protected string $name = '';
+
     /**
      * The `Output` object used to send response data to the user.
      *
@@ -41,6 +56,13 @@ class Console {
      */
     protected Output $output;
 
+    /**
+     * The version of the application.
+     *
+     * @var string
+     */
+    protected string $version = '';
+
     /**
      * Construct a new `Console` application.
      */
@@ -68,7 +90,12 @@ class Console {
         $command = new ReflectionClass($command);
         $command = $command->newInstance($this->input, $this->output);
 
-        $this->input->addCommand($command);
+        try {
+            $this->input->addCommand($command);
+        } catch (Exception $e) {
+            $this->output->renderException($e);
+            $this->shutdown();
+        }
 
         return $this;
     }
@@ -95,6 +122,52 @@ class Console {
         $this->output->setStyle('info', new StyleDefinition('green'));
         $this->output->setStyle('warning', new StyleDefinition('yellow'));
         $this->output->setStyle('error', new StyleDefinition('red'));
+        $this->output->setStyle('exception', new StyleDefinition('white', 'red'));
+    }
+
+    /**
+     * Retrieve the application's banner.
+     *
+     * @return string
+     */
+    public function getBanner(): string {
+        return $this->banner;
+    }
+
+    /**
+     * Retrieve the console's `Input` object.
+     *
+     * @return \Titon\Console\Input
+     */
+    public function getInput(): Input {
+        return $this->input;
+    }
+
+    /**
+     * Retrieve the application's name.
+     *
+     * @return string
+     */
+    public function getName(): string {
+        return $this->name;
+    }
+
+    /**
+     * Retrieve the console's `Output` object.
+     *
+     * @return \Titon\Console\Output
+     */
+    public function getOutput(): Output {
+        return $this->output;
+    }
+
+    /**
+     * Retrieve the application's version.
+     *
+     * @return string
+     */
+    public function getVersion(): string {
+        return $this->version;
     }
 
     /**
@@ -109,6 +182,8 @@ class Console {
         } else {
             $this->runCommand($this->command);
         }
+
+        $this->shutdown();
     }
 
     /**
@@ -145,7 +220,12 @@ class Console {
             $this->output->setVerbosity($verbosity);
         }
 
-        $command->run();
+        try {
+            $command->run();
+        } catch (Exception $e) {
+            $this->output->renderException($e);
+            $this->shutdown();
+        }
     }
 
     /**
@@ -154,11 +234,57 @@ class Console {
      * @param \Titon\Console\Command|null $command  The `Command` to render usage for
      */
     public function renderHelpScreen(?Command $command = null): void {
-        $helpScreen = new HelpScreen($this->input);
+        $helpScreen = new HelpScreen($this);
         if (!is_null($command)) {
             $helpScreen->setCommand($command);
         }
 
         $this->output->out($helpScreen->render());
     }
+
+    /**
+     * Set the banner of the application.
+     *
+     * @param string $banner    The banner decorator
+     *
+     * @return $this
+     */
+    public function setBanner(string $banner): this {
+        $this->banner = $banner;
+
+        return $this;
+    }
+
+    /**
+     * Set the name of the application.
+     *
+     * @param string $name  The name of the application
+     *
+     * @return $this
+     */
+    public function setName(string $name): this {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * Set the version of the application.
+     *
+     * @param string $version   The version of the application
+     *
+     * @return $this
+     */
+    public function setVersion(string $version): this {
+        $this->version = $version;
+
+        return $this;
+    }
+
+    /**
+     * Shutdown method executed at the end of the application's run.
+     */
+    protected function shutdown(): void {
+        exit(1);
+    }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/Feedback/AbstractFeedback.hh b/src/Titon/Console/Feedback/AbstractFeedback.hh
index 5cfc19e..0307b4a 100644
--- a/src/Titon/Console/Feedback/AbstractFeedback.hh
+++ b/src/Titon/Console/Feedback/AbstractFeedback.hh
@@ -149,7 +149,6 @@ abstract class AbstractFeedback implements Feedback {
 
         if ($this->current === $this->total) {
             $this->display(true);
-            $this->output->out();
         }
     }
 
diff --git a/src/Titon/Console/Feedback/ProgressBar.hh b/src/Titon/Console/Feedback/ProgressBar.hh
index 9b28fe3..fb14d48 100644
--- a/src/Titon/Console/Feedback/ProgressBar.hh
+++ b/src/Titon/Console/Feedback/ProgressBar.hh
@@ -59,7 +59,12 @@ class ProgressBar extends AbstractFeedback {
             'suffix'   => $suffix
         };
 
-        $this->output->out(Str::insert($this->format, $variables, Map {'escape' => false}), Output::VERBOSITY_NORMAL, 1, Output::CR);
+        $eol = Output::CR;
+        if ($finish === true) {
+            $eol = Output::LF;
+        }
+
+        $this->output->out(Str::insert($this->format, $variables, Map {'escape' => false}), Output::VERBOSITY_NORMAL, 1, $eol);
     }
 
     /**
diff --git a/src/Titon/Console/Feedback/Wait.hh b/src/Titon/Console/Feedback/Wait.hh
index 82ee83a..27e7a8d 100644
--- a/src/Titon/Console/Feedback/Wait.hh
+++ b/src/Titon/Console/Feedback/Wait.hh
@@ -64,13 +64,18 @@ class Wait extends AbstractFeedback {
             'suffix'   => $suffix
         };
 
+        $eol = Output::CR;
+        if ($finish === true) {
+            $eol = Output::LF;
+        }
+
         $this->output->out(
             str_pad(Str::insert(
                 $this->format, $variables
             ), SystemFactory::factory()->getWidth()),
             1,
             Output::VERBOSITY_NORMAL,
-            Output::CR
+            $eol
         );
     }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/HelpScreen.hh b/src/Titon/Console/HelpScreen.hh
index 4851cb2..a62b8b5 100644
--- a/src/Titon/Console/HelpScreen.hh
+++ b/src/Titon/Console/HelpScreen.hh
@@ -42,6 +42,13 @@ class HelpScreen {
      */
     protected CommandMap $commands;
 
+    /**
+     * The `Console` object to render a help screen for.
+     *
+     * @var \Titon\Console\Console
+     */
+    protected Console $console;
+
     /**
      * The available `Flag` objects accepted.
      *
@@ -67,10 +74,12 @@ class HelpScreen {
     /**
      * Construct a new instance of the `HelpScreen`.
      *
-     * @param \Titon\Console\Input $input   The `Input` to read all available
-     *                                      parameters from
+     * @param \Titon\Console\Input $input   The `Console` application
      */
-    public function __construct(Input $input) {
+    public function __construct(Console $console) {
+        $this->console = $console;
+
+        $input = $console->getInput();
         $this->commands = $input->getCommands();
         $this->arguments = $input->getArguments();
         $this->flags = $input->getFlags();
@@ -187,23 +196,31 @@ class HelpScreen {
      * @return string
      */
     protected function renderHeading(): string {
-        $retval = '';
+        $retval = Vector {};
 
-        if (!is_null($this->command)) {
-            $command = $this->command;
+        if (!is_null($command = $this->command)) {
 
             invariant(!is_null($command), "Must be a command.");
 
             if ($description = $command->getDescription()) {
-                $retval = $command->getName() . ' - ' . $description;
+                $retval[] = $command->getName() . ' - ' . $description;
             } else {
-                $retval = $command->getName();
+                $retval[] = $command->getName();
+            }
+        } else if ($this->console->getName() !== '') {
+            if (($banner = $this->console->getBanner()) !== '') {
+                $retval[] = $banner;
             }
-        } else if ($this->name !== '') {
-            $retval = $this->name;
+
+            $name = $this->console->getName();
+            if (($version = $this->console->getVersion()) !== '') {
+                $name .= " version $version";
+            }
+
+            $retval[] = $name;
         }
 
-        return $retval;
+        return implode("\n", $retval);
     }
 
     /**
diff --git a/src/Titon/Console/Input.hh b/src/Titon/Console/Input.hh
index 82c73c9..f8c5e24 100644
--- a/src/Titon/Console/Input.hh
+++ b/src/Titon/Console/Input.hh
@@ -462,9 +462,9 @@ class Input {
         }
 
         foreach ($this->flags as $name => $flag) {
-            if ($key === $flag->getNegativeAlias()) {
-                invariant($flag instanceof Flag, "Must be a Flag.");
+            invariant($flag instanceof Flag, "Must be a Flag.");
 
+            if ($key === $flag->getNegativeAlias()) {
                 $flag->setValue(0);
                 $flag->setExists(true);
 
@@ -485,19 +485,17 @@ class Input {
      */
     protected function parseOption(RawInput $input): bool {
         $key = $input['value'];
-        if (is_null($option = $this->options->get($key))) {
+        $option = $this->options->get($key);
+        if (is_null($option)) {
             return false;
         }
 
-        invariant(!is_null($option), "Must not be null.");
-
         // Peak ahead to make sure we get a value.
-        if (is_null($nextValue = $this->input->peek())) {
+        $nextValue = $this->input->peek();
+        if (is_null($nextValue)) {
             throw new MissingValueException(sprintf("No value given for the option %s.", $input['value']));
         }
 
-        invariant(!is_null($nextValue), "Must be RawInput.");
-
         if (!$this->input->end() && $this->input->isArgument($nextValue['raw'])) {
             throw new MissingValueException("No value is present for option $key");
         }
diff --git a/src/Titon/Console/Output.hh b/src/Titon/Console/Output.hh
index 7e7dc8c..73a7eb3 100644
--- a/src/Titon/Console/Output.hh
+++ b/src/Titon/Console/Output.hh
@@ -7,6 +7,7 @@
 
 namespace Titon\Console;
 
+use Exception;
 use Titon\Console\System\SystemFactory;
 
 /**
@@ -118,7 +119,7 @@ class Output {
         $parsedTags = array_unique($this->parseTags($message));
         $retval = $message;
         foreach ($parsedTags as $xmlTag) {
-            if (!is_null($this->styles[$xmlTag])) {
+            if (!is_null($this->styles->get($xmlTag))) {
                 $style = $this->styles[$xmlTag];
                 $retval = $style->format($xmlTag, $retval);
                 $matches = [];
@@ -181,6 +182,32 @@ class Output {
         return $tagsMatched[1];
     }
 
+    /**
+     * Basic `Exception` renderer to handle outputting of uncaught exceptions
+     * thrown in `Command` objects.
+     *
+     * @param Exception $exception  The `Exception` thrown
+     */
+    public function renderException(Exception $exception): void {
+        $class = explode("\\", get_class($exception));
+        $class = $class[count($class) - 1];
+
+        $message = explode('{{BREAK}}', wordwrap($exception->getMessage(), 40, "{{BREAK}}"));
+        array_unshift($message, "[$class]");
+        $elen = max(array_map('strlen', $message));
+
+        $this->error(Output::LF);
+        $this->error("<exception>  " . str_pad("", $elen) . "  </exception>");
+
+        foreach ($message as $line) {
+            $line = str_pad($line, $elen);
+            $this->error("<exception>  $line  </exception>");
+        }
+
+        $this->error("<exception>  " . str_pad("", $elen) . "  </exception>");
+        $this->error(Output::LF);
+    }
+
     /**
      * Send the response through the given output stream.
      *
diff --git a/src/Titon/Console/StyleDefinition.hh b/src/Titon/Console/StyleDefinition.hh
index dd2c608..aab3b5d 100644
--- a/src/Titon/Console/StyleDefinition.hh
+++ b/src/Titon/Console/StyleDefinition.hh
@@ -26,15 +26,15 @@ class StyleDefinition {
      *
      * @var Map<string, int>
      */
-    protected Map<string, int> $bgColorsMap = Map {
-        'black'   => 40,
-        'red'     => 41,
-        'green'   => 42,
-        'brown'   => 43,
-        'blue'    => 44,
-        'magenta' => 45,
-        'cyan'    => 46,
-        'white'   => 47,
+    protected Map<string, string> $bgColorsMap = Map {
+        'black'   => "40",
+        'red'     => "41",
+        'green'   => "42",
+        'brown'   => "43",
+        'blue'    => "44",
+        'magenta' => "45",
+        'cyan'    => "46",
+        'white'   => "47",
     };
 
     /**
@@ -129,13 +129,7 @@ class StyleDefinition {
      * @return string
      */
     public function getBgColorCode(): string {
-        if (!is_null($bgColor = $this->bgColorsMap->get($this->bgColor))) {
-            invariant(is_string($bgColor), "Must be a string.");
-
-            return $bgColor;
-        }
-
-        return '';
+        return $this->bgColorsMap->get($this->bgColor) ?: '';
     }
 
     /**
@@ -162,13 +156,7 @@ class StyleDefinition {
      * @return string
      */
     public function getFgColorCode(): string {
-        if (!is_null($fgColor = $this->fgColorsMap->get($this->fgColor))) {
-            invariant(is_string($fgColor), "Must be a string.");
-
-            return $fgColor;
-        }
-
-        return '';
+        return $this->fgColorsMap->get($this->fgColor) ?: '';
     }
 
     /**

From 5b5fcd637313c4d7963b1002c7d01d958b391f8d Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Wed, 11 Mar 2015 22:20:03 -0400
Subject: [PATCH 65/92] fixed type errors, made the `Tree` class's date an
 alias,

---
 src/Titon/Console/Output.hh            | 11 +++++++----
 src/Titon/Console/Tree.hh              |  8 ++++----
 src/Titon/Console/Tree/AbstractTree.hh | 23 +++++++++++++----------
 src/Titon/Console/Tree/AsciiTree.hh    |  4 +++-
 src/Titon/Console/Tree/MarkdownTree.hh |  4 +++-
 src/Titon/Console/bootstrap.hh         |  1 +
 6 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/Titon/Console/Output.hh b/src/Titon/Console/Output.hh
index 73a7eb3..e8e4596 100644
--- a/src/Titon/Console/Output.hh
+++ b/src/Titon/Console/Output.hh
@@ -194,17 +194,20 @@ class Output {
 
         $message = explode('{{BREAK}}', wordwrap($exception->getMessage(), 40, "{{BREAK}}"));
         array_unshift($message, "[$class]");
-        $elen = max(array_map('strlen', $message));
+
+        $length = max(array_map(($key) ==> {
+            return strlen($key);
+        }, $message));
 
         $this->error(Output::LF);
-        $this->error("<exception>  " . str_pad("", $elen) . "  </exception>");
+        $this->error("<exception>  " . str_pad("", $length) . "  </exception>");
 
         foreach ($message as $line) {
-            $line = str_pad($line, $elen);
+            $line = str_pad($line, $length);
             $this->error("<exception>  $line  </exception>");
         }
 
-        $this->error("<exception>  " . str_pad("", $elen) . "  </exception>");
+        $this->error("<exception>  " . str_pad("", $length) . "  </exception>");
         $this->error(Output::LF);
     }
 
diff --git a/src/Titon/Console/Tree.hh b/src/Titon/Console/Tree.hh
index 695447a..cfcb201 100644
--- a/src/Titon/Console/Tree.hh
+++ b/src/Titon/Console/Tree.hh
@@ -17,9 +17,9 @@ interface Tree {
     /**
      * Retrieve the data structure of the `Tree`.
      *
-     * @return array<mixed>
+     * @return \Titon\Console\TreeData
      */
-    public function getData(): array<mixed>;
+    public function getData(): TreeData;
 
     /**
      * Build and return the markup for the `Tree`.
@@ -31,9 +31,9 @@ interface Tree {
     /**
      * Set the data for the tree.
      *
-     * @param array<mixed> $data    The data for the tree
+     * @param \Titon\Console\TreeData $data The data for the tree
      *
      * @return $this
      */
-    public function setData(array<mixed> $data): this;
+    public function setData(TreeData $data): this;
 }
\ No newline at end of file
diff --git a/src/Titon/Console/Tree/AbstractTree.hh b/src/Titon/Console/Tree/AbstractTree.hh
index cff3cf4..f90a620 100644
--- a/src/Titon/Console/Tree/AbstractTree.hh
+++ b/src/Titon/Console/Tree/AbstractTree.hh
@@ -8,6 +8,7 @@
 namespace Titon\Console\Tree;
 
 use Titon\Console\Tree;
+use Titon\Console\TreeData;
 
 /**
  * The `AbstractTree` class provides core functionality for building a tree given
@@ -20,36 +21,38 @@ abstract class AbstractTree implements Tree {
     /**
      * The data for the tree.
      *
-     * @var array<mixed>
+     * @var \Titon\Console\TreeData
      */
-    protected array<mixed> $data = [];
+    protected TreeData $data = [];
 
     /**
      * Construct a new instance of a tree.
      *
-     * @param array<mixed> $data    The data to render
+     * @param \Titon\Console\TreeData $data The data to render
      */
-    public function __construct(array<mixed> $data = []) {
-        $this->data = $data;
+    public function __construct(?TreeData $data = null) {
+        if (!is_null($data)) {
+            $this->data = $data;
+        }
     }
 
     /**
      * Recursively build the tree and each branch and prepend necessary markup
      * for the output.
      *
-     * @param array<mixed> $tree    The tree or branch to build
+     * @param \Titon\Console\TreeData $tree The tree or branch to build
      * @param string $prefix        The markup prefix for the tree / branch
      *
      * @retun string
      */
-    abstract protected function build(array<mixed> $tree, string $prefix = ''): string;
+    abstract protected function build(TreeData $tree, string $prefix = ''): string;
 
     /**
      * Retrieve the data of the tree.
      *
-     * @return array<mixed>
+     * @return \Titon\Console\TreeData
      */
-    public function getData(): array<mixed> {
+    public function getData(): TreeData {
         return $this->data;
     }
 
@@ -65,7 +68,7 @@ abstract class AbstractTree implements Tree {
     /**
      * {@inheritdoc}
      */
-    public function setData(array<mixed> $data): this {
+    public function setData(TreeData $data): this {
         $this->data = $data;
 
         return $this;
diff --git a/src/Titon/Console/Tree/AsciiTree.hh b/src/Titon/Console/Tree/AsciiTree.hh
index 8b6df55..e741eec 100644
--- a/src/Titon/Console/Tree/AsciiTree.hh
+++ b/src/Titon/Console/Tree/AsciiTree.hh
@@ -7,6 +7,8 @@
 
 namespace Titon\Console\Tree;
 
+use Titon\Console\TreeData;
+
 /**
  * Build a human readable ASCII tree given an infinitely nested data structure.
  *
@@ -17,7 +19,7 @@ class AsciiTree extends AbstractTree {
     /**
      * {@inheritdoc}
      */
-    protected function build(array<mixed> $tree, string $prefix = ''): string {
+    protected function build(TreeData $tree, string $prefix = ''): string {
         if (is_null($tree)) {
             $tree = $this->data;
         }
diff --git a/src/Titon/Console/Tree/MarkdownTree.hh b/src/Titon/Console/Tree/MarkdownTree.hh
index 91f3b86..c49a5d6 100644
--- a/src/Titon/Console/Tree/MarkdownTree.hh
+++ b/src/Titon/Console/Tree/MarkdownTree.hh
@@ -7,6 +7,8 @@
 
 namespace Titon\Console\Tree;
 
+use Titon\Console\TreeData;
+
 /**
  * Build a tree given an infinitely nested data structure using Markdown syntax.
  *
@@ -17,7 +19,7 @@ class MarkdownTree extends AbstractTree {
     /**
      * {@inheritdoc}
      */
-    protected function build(array<mixed> $tree, string $prefix = ''): string {
+    protected function build(TreeData $tree, string $prefix = ''): string {
         if (is_null($tree)) {
             $tree = $this->data;
         }
diff --git a/src/Titon/Console/bootstrap.hh b/src/Titon/Console/bootstrap.hh
index 70456b7..f9d196b 100644
--- a/src/Titon/Console/bootstrap.hh
+++ b/src/Titon/Console/bootstrap.hh
@@ -27,4 +27,5 @@ namespace Titon\Console {
         'value' => string
     );
     type StyleMap = Map<string, StyleDefinition>;
+    type TreeData = array<mixed>;
 }
\ No newline at end of file

From 0cedcb6434f6879ff3f07e384f670de796d5f925 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Thu, 12 Mar 2015 08:07:37 -0400
Subject: [PATCH 66/92] added some missing docs, altered some class names

---
 src/Titon/Console/System/SystemFactory.hh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Titon/Console/System/SystemFactory.hh b/src/Titon/Console/System/SystemFactory.hh
index 6f37d5e..4118e25 100644
--- a/src/Titon/Console/System/SystemFactory.hh
+++ b/src/Titon/Console/System/SystemFactory.hh
@@ -24,9 +24,9 @@ class SystemFactory {
      */
     public static function factory(): System {
         if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-            return new Windows();
+            return new WindowsSystem();
         }
 
-        return new Linux();
+        return new LinuxSystem();
     }
 }
\ No newline at end of file

From a6118e21db2393022baf05823efc08eee27ff114 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Thu, 12 Mar 2015 08:07:51 -0400
Subject: [PATCH 67/92] added some missing docs, altered some class names

---
 src/Titon/Console/Command/AbstractCommand.hh  | 28 +++++++++++++++----
 ...{ProgressBar.hh => ProgressBarFeedback.hh} |  4 +--
 .../Feedback/{Wait.hh => WaitFeedback.hh}     |  4 +--
 src/Titon/Console/HelpScreen.hh               |  4 +--
 .../AbstractInputDefinition.hh                |  4 +--
 .../System/{Linux.hh => LinuxSystem.hh}       |  2 +-
 .../System/{Windows.hh => WindowsSystem.hh}   |  2 +-
 7 files changed, 32 insertions(+), 16 deletions(-)
 rename src/Titon/Console/Feedback/{ProgressBar.hh => ProgressBarFeedback.hh} (94%)
 rename src/Titon/Console/Feedback/{Wait.hh => WaitFeedback.hh} (93%)
 rename src/Titon/Console/System/{Linux.hh => LinuxSystem.hh} (94%)
 rename src/Titon/Console/System/{Windows.hh => WindowsSystem.hh} (97%)

diff --git a/src/Titon/Console/Command/AbstractCommand.hh b/src/Titon/Console/Command/AbstractCommand.hh
index 5781f56..bfab022 100644
--- a/src/Titon/Console/Command/AbstractCommand.hh
+++ b/src/Titon/Console/Command/AbstractCommand.hh
@@ -7,8 +7,8 @@
 
 namespace Titon\Console\Command;
 
-use Titon\Console\Feedback\ProgressBar;
-use Titon\Console\Feedback\Wait;
+use Titon\Console\Feedback\ProgressBarFeedback;
+use Titon\Console\Feedback\WaitFeedback;
 use Titon\Console\InputBag;
 use Titon\Console\Command;
 use Titon\Console\Input;
@@ -256,8 +256,17 @@ abstract class AbstractCommand implements Command {
         $this->output->out($output);
     }
 
-    protected function progressBar(int $total = 0, string $message = '', int $interval = 100): ProgressBar {
-        return new ProgressBar($this->output, $total, $message, $interval);
+    /**
+     * Construct and return a new instance of `ProgressBarFeedback`.
+     *
+     * @param int    $total
+     * @param string $message
+     * @param int    $interval
+     *
+     * @return \Titon\Console\Feedback\ProgressBarFeedback
+     */
+    protected function progressBar(int $total = 0, string $message = '', int $interval = 100): ProgressBarFeedback {
+        return new ProgressBarFeedback($this->output, $total, $message, $interval);
     }
 
     /**
@@ -337,7 +346,14 @@ abstract class AbstractCommand implements Command {
         return $this;
     }
 
-    protected function wait(int $total = 0, string $message = '', int $interval = 100): Wait {
-        return new  Wait($this->output, $total, $message, $interval);
+    /**
+     * Construct and return a new `WaitFeedback` object.
+     *
+     * @param int    $total     The total number of cycles of the process
+     * @param string $message   The message presented with the feedback
+     * @param int    $interval  The time inverval the feedback should update
+     */
+    protected function wait(int $total = 0, string $message = '', int $interval = 100): WaitFeedback {
+        return new  WaitFeedback($this->output, $total, $message, $interval);
     }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/Feedback/ProgressBar.hh b/src/Titon/Console/Feedback/ProgressBarFeedback.hh
similarity index 94%
rename from src/Titon/Console/Feedback/ProgressBar.hh
rename to src/Titon/Console/Feedback/ProgressBarFeedback.hh
index fb14d48..e10dc48 100644
--- a/src/Titon/Console/Feedback/ProgressBar.hh
+++ b/src/Titon/Console/Feedback/ProgressBarFeedback.hh
@@ -13,13 +13,13 @@ use Titon\Console\System\SystemFactory;
 use Titon\Console\Exception\InvalidCharacterSequence;
 
 /**
- * The `ProgressBar` class displays feedback information with a progress bar.
+ * The `ProgressBarFeedback` class displays feedback information with a progress bar.
  * Additional information including percentage done, time elapsed, and time
  * remaining is included by default.
  *
  * @package Titon\Console\Feedback
  */
-class ProgressBar extends AbstractFeedback {
+class ProgressBarFeedback extends AbstractFeedback {
 
     /**
      * The 2-string character format to use when constructing the displayed bar.
diff --git a/src/Titon/Console/Feedback/Wait.hh b/src/Titon/Console/Feedback/WaitFeedback.hh
similarity index 93%
rename from src/Titon/Console/Feedback/Wait.hh
rename to src/Titon/Console/Feedback/WaitFeedback.hh
index 27e7a8d..baddd1e 100644
--- a/src/Titon/Console/Feedback/Wait.hh
+++ b/src/Titon/Console/Feedback/WaitFeedback.hh
@@ -12,11 +12,11 @@ use Titon\Console\Output;
 use Titon\Console\System\SystemFactory;
 
 /**
- * The `Wait` class displays feedback by cycling through a series of characters.
+ * The `WaitFeedback` class displays feedback by cycling through a series of characters.
  *
  * @package Titon\Console\Feedback
  */
-class Wait extends AbstractFeedback {
+class WaitFeedback extends AbstractFeedback {
 
     /**
      * {@inheritdoc}
diff --git a/src/Titon/Console/HelpScreen.hh b/src/Titon/Console/HelpScreen.hh
index a62b8b5..e37a419 100644
--- a/src/Titon/Console/HelpScreen.hh
+++ b/src/Titon/Console/HelpScreen.hh
@@ -38,7 +38,7 @@ class HelpScreen {
     /**
      * The available `Command` objects available.
      *
-     * @var CommandMap
+     * @var \Titon\Console\CommandMap
      */
     protected CommandMap $commands;
 
@@ -340,7 +340,7 @@ class HelpScreen {
     /**
      * Set the `Command` to render a the help screen for.
      *
-     * @param \Titon\Console\InputBag<Argument> $arguments The `Command` object
+     * @param \Titon\Console\Command $command   The `Command` object
      *
      * @return $this
      */
diff --git a/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh b/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
index d83d6e4..bc2d244 100644
--- a/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
+++ b/src/Titon/Console/InputDefinition/AbstractInputDefinition.hh
@@ -183,9 +183,9 @@ abstract class AbstractInputDefinition<T> implements InputDefinition {
     }
 
     /**
-     * Set the value of the `Flag`.
+     * Set the value of the `InputDefinition`.
      *
-     * @param int $value The value given to the `Flag`
+     * @param int $value The value given to the `InputDefinition`
      *
      * @return $this
      */
diff --git a/src/Titon/Console/System/Linux.hh b/src/Titon/Console/System/LinuxSystem.hh
similarity index 94%
rename from src/Titon/Console/System/Linux.hh
rename to src/Titon/Console/System/LinuxSystem.hh
index ee9008c..e4000e2 100644
--- a/src/Titon/Console/System/Linux.hh
+++ b/src/Titon/Console/System/LinuxSystem.hh
@@ -12,7 +12,7 @@ namespace Titon\Console\System;
  *
  * @package Titon\Console\System
  */
-class Linux extends AbstractSystem {
+class LinuxSystem extends AbstractSystem {
 
     /**
      * {@inheritdoc}
diff --git a/src/Titon/Console/System/Windows.hh b/src/Titon/Console/System/WindowsSystem.hh
similarity index 97%
rename from src/Titon/Console/System/Windows.hh
rename to src/Titon/Console/System/WindowsSystem.hh
index 1229639..8be6d2c 100644
--- a/src/Titon/Console/System/Windows.hh
+++ b/src/Titon/Console/System/WindowsSystem.hh
@@ -12,7 +12,7 @@ namespace Titon\Console\System;
  *
  * @package Titon\Console\System
  */
-class Windows extends AbstractSystem {
+class WindowsSystem extends AbstractSystem {
 
     /**
      * Data structure containing the relevant output from the `mode` command.

From 7974a6441572a42f0da76ca1a7395095767dde47 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Thu, 12 Mar 2015 18:06:58 -0400
Subject: [PATCH 68/92] initial commit -  VERY rough draft

---
 docs/en/packages/console/commands.md |  37 +++++++
 docs/en/packages/console/console.md  |  33 ++++++
 docs/en/packages/console/index.md    |  17 +++
 docs/en/packages/console/input.md    | 155 +++++++++++++++++++++++++++
 4 files changed, 242 insertions(+)
 create mode 100644 docs/en/packages/console/commands.md
 create mode 100644 docs/en/packages/console/console.md
 create mode 100644 docs/en/packages/console/index.md
 create mode 100644 docs/en/packages/console/input.md

diff --git a/docs/en/packages/console/commands.md b/docs/en/packages/console/commands.md
new file mode 100644
index 0000000..b26ba5b
--- /dev/null
+++ b/docs/en/packages/console/commands.md
@@ -0,0 +1,37 @@
+# Commands #
+
+A `Command` is a user-created class that handles a specific process with executed by the user from a `Console` application.
+
+## Setup ##
+
+A `Command` object is required to have at least 2 methods: `configure` and `run`.
+
+The `configure` method is where the user will specify the name of the command, an optional description, and register any command-specific parameters to be used at runtime.
+
+The `run` method is executed by the `Console` after all necessary input is processed.
+
+```hack
+class HelloWorldCommand {
+
+    public function configure() {
+        $this->setName("hello")->setDescription("A simple 'hello world' command!");
+        $this->addArgument(new Argument("name"));
+    }
+
+    public function run() {
+        if (!is_null($name = $this->getArgument('name'))) {
+            $this->out("Hello, $name!");
+        } else {
+            $this->out("Hello, world!");
+        }
+    }
+}
+```
+
+## Accessing Parameters ##
+
+As shown above, the `getArgument` method inside of the command returns a value as opposed to the `Input` class which returns the `Argument` object. The methods `getFlag`, `getOption`, and `getArgument`, when used inside of the `Command`, will return the value (or default) of the registered parameter. If there is a necessity to access the actual objects, these can be retrieved by calling the same commands on the class's `Input` variable.
+
+```hack
+$nameArgument = $this->input->getArgument('name');
+```
diff --git a/docs/en/packages/console/console.md b/docs/en/packages/console/console.md
new file mode 100644
index 0000000..c93c221
--- /dev/null
+++ b/docs/en/packages/console/console.md
@@ -0,0 +1,33 @@
+# Console #
+
+The `Console` object functions as the `application` of the console package.
+
+## Construction ##
+
+Creating an application is as simple as constructing a new `Console` object and optionally passing in `Input` and `Output` objects. If no `Input` object is passed in, a new one is constructed using the global arguments provided by the PHP/Hack language.
+
+```hack
+$app = new Console();
+```
+
+## Commands ##
+
+Once a new application has been created, add commands by calling `addCommand` and passing in a new instance of the command itself. The `Console` object will take care of setting up and configuring the `Command` as necessary.
+
+````hack
+$app->addCommand(new MyCommand());
+```
+
+## Running the Application ##
+
+Once all necessary commands have been added, calling `run` on the `Console` object will execute the application.
+
+```hack
+$app->run();
+```
+
+When executing the application from the command line, the `Console` object will handle the following situations:
+
+* If no command is provided or the `help` flag is present, the help screen of the application will be presented listing all global flags, global options, and available commands.
+* If a command is present and the `help` flag is present, the help screen of the given command will be presented listing all available options, flags, and arguments as well as the usage of the command and its description.
+* If the command is present with valid parameters, the `Console` application will execute the `run` command of the `Command`.
diff --git a/docs/en/packages/console/index.md b/docs/en/packages/console/index.md
new file mode 100644
index 0000000..1cbeb81
--- /dev/null
+++ b/docs/en/packages/console/index.md
@@ -0,0 +1,17 @@
+# Console Package #
+
+The Console package is almost a type of framework in itself with a collection of tools to aid in the construction of command line applications as well as necessary bootstrapping for handling all input, output, and help information.
+
+### Requirements ###
+
+* [Titon Utility package](../packages/utility/index.md)
+
+### Installation ###
+
+This package can be installed with Composer using the core package.
+
+```shell
+composer require titon/console:*
+```
+
+### Documentation ###
diff --git a/docs/en/packages/console/input.md b/docs/en/packages/console/input.md
new file mode 100644
index 0000000..d684aec
--- /dev/null
+++ b/docs/en/packages/console/input.md
@@ -0,0 +1,155 @@
+# Input #
+
+All user input is handled by the `Input` class. This is where you define all input that is accepted in the command and/or application itself. The `Input` class also handles parsing of the input to be easily read later.
+
+## Parameters ##
+
+Parameters are any input given by the user into the command line application. The supported types of parameters are flags, options, arguments, and commands.
+
+#### Default Values ####
+
+All parameters share many attributes and functionality. A default value (initially `null`), can be assigned to each parameter that will pose as its returned value if no input is given by the user.
+
+```hack
+$param->setDefault('yes');
+```
+
+Using `getValue` on any parameter will return the default value assigned if no value is given. An easy way to determine if a parameter has been specified by the user is to use the `exists` method. This will return true if a value has been assigned to the parameter by the user, false otherwise.
+
+#### Description ####
+
+The (optional) description of each parameter can also be set either in its constructor or via a `setter` method. This description is used when rendering the help screen.
+
+```hack
+$param->setDescription('This is a handy parameter!');
+```
+
+#### Aliases ####
+
+Flags and options also support aliasing. Given the flag `--foo`, an alias assigned to it of `-f` will allow the user to retrieve the flag and assign values using either name.
+
+```hack
+$param = (new Flag('foo'))->alias('f');
+```
+
+#### Mode ####
+
+The `mode` of a parameter applies to all types: flags, options, and arguments. The mode determines if user input is required for the paramter. If no input is given and the mode is set to be required, then an exception will be thrown.
+
+The `mode` is set at construction or through a `setter` method. By default, all parameters are set to optional.
+
+```hack
+$param->setMode(AbstractInputDefinition::MODE_REQUIRED);
+```
+
+### Flags ###
+
+A `Flag` is a `boolean` flag that is only checked by the parser for its existence. If the flag is present, it is given a value of 1 and a value of 0 is given if it is not.
+
+**NOTE:** Although we say its a `boolean` parameter, that only means the parser does not attempt to give the parameter a value read from the user input. The `value` assigned to flags are actually numeric to allow for stackable flags.
+
+A flag is added to the `Input` object via the `addFlag` method.
+
+```hack
+$input->addFlag(new Flag('foo'));
+```
+
+Construction of a `Flag` is done by denoting a name for the flag, an optional description, a `mode` (if the flag is required or not), an a boolean value to determine if the flag is stackable.
+
+```hack
+$flag = new Flag('verbose', 'Set the verbosity level of the application', Flag::MODE_OPTIONAL, true);
+```
+
+A registered `Flag` object can be retrieved from the `Input` class by calling the `getFlag` method and passing in either the name or alias of the flag.
+
+```hack
+$myFlag = $input->getFlag('foo'); // Valid
+$myFlag = $input->getFlag('f'); // Also valid
+```
+
+All registered flags can also be retrieved via the `getFlags` method.
+
+#### Stackable Flags #####
+
+If a flag is stackable, then the presence of multiple instances of the flag (consecutively) will increase the value of the flag.
+
+```bash
+-vvv // Given a value of 3
+```
+
+If the flag is not stackable, then it is either given a value of 1 (present) and 0 (if not present).
+
+### Options ###
+
+An `Option` is a value-based parameter that is assigned a value based on the input from the command line. The parser handles many different types of notations for reading in options:
+
+```bash
+// Long notation
+--foo bar
+--foo=bar
+--foo="bar"
+
+// Short notation
+-f bar
+-f=bar
+-f="bar"
+```
+
+An option is added to the `Input` object via the `addOption` method.
+
+```hack
+$input->addOption(new Option('foo'));
+```
+
+**NOTE:** If a value containing spaces is to meant to be assigned to an option, it is required to be in quotes.
+
+A registered `Option` object can be retrieved from the `Input` class by calling the `getOption` method and passing in either the name or alias of the option.
+
+```hack
+$myOption = $input->getOption('foo'); // Valid
+$myOption = $input->getOption('f'); // Also valid
+```
+
+All registered options can also be retrieved via the `getOptions` method.
+
+### Arguments ###
+
+Arguments are parameters passed into the application that are not represented by any specific notation. For example, a 'hello world' application may accept a name argument and would be run as:
+
+```hack
+hhvm hello.hh "Alex Phillips"
+```
+
+An argument is added to the `Input` object via the `addArgument` method.
+
+```hack
+$input->addArgument(new Argument('foo'));
+```
+
+A registered `Argument` object can be retrieved from the `Input` class by calling the `getArgument` method and passing in the name of the argument.
+
+```hack
+$nameArgument = $input->getArgument('name');
+```
+
+All registered arguments can also be retrieved via the `getArguments` method.
+
+## [Commands](commands.md) ##
+
+Commands are added to the application through the `addCommand` method in the `Input` class. You can either preemptively parse a command out from the `Input` by calling `getActiveCommand`, or simply call `parse` which will parse out the command along with the rest of the registered parameters.
+
+Once the input has been parsed, `getActiveCommand` will return whatever command has been parsed.
+
+```hack
+$input->addCommand(new MyCommand());
+```
+
+*See [Commands](commands.md) for more information.*
+
+## User Input ##
+
+The `Input` class also manages all user input via STDIN. This functionality is used in the [user input](user-input.md) classes for retrieving information from the user. If this functionality is needed outside of these classes, simply call `getUserInput` to prompt and return the entered value.
+
+```hack
+$usersValue = $input->getUserInput();
+```

From 26ecae706795fa257c8d8daf15b582af1f9c876f Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Thu, 12 Mar 2015 18:44:39 -0400
Subject: [PATCH 69/92] added support for forcing ansi output and suppressing
 ansi output with defined flags

---
 src/Titon/Console/Console.hh         | 19 ++++++++--
 src/Titon/Console/Output.hh          | 54 ++++++++++++++++++++++++++--
 src/Titon/Console/StyleDefinition.hh |  9 ++++-
 3 files changed, 76 insertions(+), 6 deletions(-)

diff --git a/src/Titon/Console/Console.hh b/src/Titon/Console/Console.hh
index d2b02f7..827e13e 100644
--- a/src/Titon/Console/Console.hh
+++ b/src/Titon/Console/Console.hh
@@ -115,6 +115,10 @@ class Console {
         $this->input->addFlag((new Flag('verbose', 'Set the verbosity of the application\'s output.'))
             ->alias('v')
             ->setStackable(true));
+        $this->input->addFlag((new Flag('version', "Display the application's version"))
+            ->alias('V'));
+        $this->input->addFlag(new Flag('ansi', "Force ANSI output"));
+        $this->input->addFlag(new Flag('no-ansi', "Disable ANSI output"));
 
         /*
          * Add default styles
@@ -195,13 +199,22 @@ class Console {
         $command->registerInput();
         $this->input->parse();
 
-        $flag = $this->input->getFlag('help');
-
-        if ($flag->getValue() === 1) {
+        if ($this->input->getFlag('help')->getValue() === 1) {
             $this->renderHelpScreen($command);
             return;
         }
 
+        if ($this->input->getFlag('version')->getValue() === 1) {
+            $this->output->out("{$this->getName()} version {$this->getVersion()}");
+            return;
+        }
+
+        if ($this->input->getFlag('ansi')->getValue() === 1) {
+            $this->output->setForceAnsi(true);
+        } else if ($this->input->getFlag('no-ansi')->getValue() === 1) {
+            $this->output->setSuppressAnsi(true);
+        }
+
         $flag = $this->input->getFlag('quiet');
 
         $verbositySet = false;
diff --git a/src/Titon/Console/Output.hh b/src/Titon/Console/Output.hh
index e8e4596..ede2c80 100644
--- a/src/Titon/Console/Output.hh
+++ b/src/Titon/Console/Output.hh
@@ -26,6 +26,13 @@ class Output {
     const string LF = PHP_EOL;
     const string CR = "\r";
 
+    /**
+     * Flag to determine if we should always output ANSI.
+     *
+     * @var bool
+     */
+    protected bool $forceAnsi = false;
+
     /**
      * The singleton instance.
      *
@@ -54,6 +61,13 @@ class Output {
      */
     protected StyleMap $styles = Map {};
 
+    /**
+     * Flag to determine if we should never output ANSI.
+     *
+     * @var bool
+     */
+    protected bool $suppressAnsi = false;
+
     /**
      * The global verbosity level for the `Output`.
      *
@@ -108,6 +122,19 @@ class Output {
         $this->send($output, $this->stderr);
     }
 
+    /**
+     * Set flag if ANSI output should be forced.
+     *
+     * @param bool $suppress    If ANSI should be forced
+     *
+     * @return $this
+     */
+        public function setForceAnsi(bool $force): this {
+        $this->forceAnsi = $force;
+
+        return $this;
+    }
+
     /**
      * Format contents by parsing the style tags and applying necessary formatting.
      *
@@ -120,11 +147,21 @@ class Output {
         $retval = $message;
         foreach ($parsedTags as $xmlTag) {
             if (!is_null($this->styles->get($xmlTag))) {
+                $outputAnsi = false;
+                if ($this->forceAnsi === true) {
+                    $outputAnsi = true;
+                } else if ($this->suppressAnsi === true) {
+                    $outputAnsi = false;
+                } else if (SystemFactory::factory()->supportsAnsi() === true) {
+                    $outputAnsi = true;
+                }
+
                 $style = $this->styles[$xmlTag];
-                $retval = $style->format($xmlTag, $retval);
+                $retval = $style->format($xmlTag, $retval, $outputAnsi);
+
                 $matches = [];
                 $retval = preg_replace_callback('#<[\w-]+?>.*<\/[\w-]+?>#', ($matches) ==> {
-                    if (SystemFactory::factory()->supportsAnsi() === true) {
+                    if ($outputAnsi === true) {
                         return sprintf("%s%s%s", $style->getEndCode(), $this->format($matches[0]), $style->getStartCode());
                     }
 
@@ -233,6 +270,19 @@ class Output {
         return $this;
     }
 
+    /**
+     * Set flag if ANSI output should be suppressed.
+     *
+     * @param bool $suppress    If ANSI should be suppressed
+     *
+     * @return $this
+     */
+    public function setSuppressAnsi(bool $suppress): this {
+        $this->suppressAnsi = $suppress;
+
+        return $this;
+    }
+
     /**
      * Set the global verbosity of the `Output`.
      *
diff --git a/src/Titon/Console/StyleDefinition.hh b/src/Titon/Console/StyleDefinition.hh
index aab3b5d..2565933 100644
--- a/src/Titon/Console/StyleDefinition.hh
+++ b/src/Titon/Console/StyleDefinition.hh
@@ -107,14 +107,21 @@ class StyleDefinition {
      *
      * @param string $xmlTag    The XML tag
      * @param string $value     The contents to format
+     * @param bool $ansiSupport If we should style the output with ANSI output
      *
      * @return string
      */
-    public function format(string $xmlTag, string $value): string {
+    public function format(string $xmlTag, string $value, bool $ansiSupport = true): string {
         $values = $this->getValueBetweenTags($xmlTag, $value);
         $retval = $value;
         foreach ($values as $val) {
             $valueReplaced = '<' . $xmlTag . '>' . $val . '</' . $xmlTag . '>';
+
+            if ($ansiSupport === false) {
+                $retval = str_replace($valueReplaced, $val, $retval);
+                continue;
+            }
+
             $valueResult = $this->replaceTagColors($val);
 
             $retval = str_replace($valueReplaced, $valueResult, $retval);

From 46acae16a13cddc1175183add369c4052b616e97 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Fri, 13 Mar 2015 07:57:12 -0400
Subject: [PATCH 70/92] added menu as default execution

---
 tests/Titon/Test/Stub/Console/CommandStub.hh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/Titon/Test/Stub/Console/CommandStub.hh b/tests/Titon/Test/Stub/Console/CommandStub.hh
index 2a8395e..464419c 100644
--- a/tests/Titon/Test/Stub/Console/CommandStub.hh
+++ b/tests/Titon/Test/Stub/Console/CommandStub.hh
@@ -52,6 +52,8 @@ class CommandStub extends AbstractCommand {
             $this->runFeedbackExample($type);
         } else if ($this->getFlag('menu')) {
             $this->runUserInputExamples();
+        } else {
+            $this->runUserInputExamples();
         }
     }
 

From 8d5632e69a1379eb98de640157bc411181ce88b4 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Sun, 15 Mar 2015 14:40:19 -0400
Subject: [PATCH 71/92] console is now integrating with the `Kernel` package,
 feedback classes support suppressing ANSI output

---
 src/Titon/Console/Command/AbstractCommand.hh  | 12 +++-
 src/Titon/Console/Console.hh                  | 59 +++++++++++++------
 .../Console/Feedback/ProgressBarFeedback.hh   |  4 ++
 src/Titon/Console/Feedback/WaitFeedback.hh    |  4 ++
 src/Titon/Console/Input.hh                    |  5 +-
 src/Titon/Console/Output.hh                   | 38 ++++++------
 src/Titon/Console/bootstrap.hh                |  1 +
 src/Titon/Console/composer.json               |  1 +
 8 files changed, 87 insertions(+), 37 deletions(-)

diff --git a/src/Titon/Console/Command/AbstractCommand.hh b/src/Titon/Console/Command/AbstractCommand.hh
index bfab022..455451f 100644
--- a/src/Titon/Console/Command/AbstractCommand.hh
+++ b/src/Titon/Console/Command/AbstractCommand.hh
@@ -80,8 +80,18 @@ abstract class AbstractCommand implements Command {
 
     /**
      * Construct a new instance of a command.
+     *
+     * @param \Titon\Console\Input|null $input  The `Input` object to inject
+     * @param \Titon\Console\Output|null $input The `Output` object to inject
      */
-    public function __construct(Input $input, Output $output) {
+    public function __construct(?Input $input = null, ?Output $output = null) {
+        if (is_null($input)) {
+            $input = new Input();
+        }
+        if (is_null($output)) {
+            $output = new Output();
+        }
+
         $this->input = $input;
         $this->output = $output;
         $this->arguments = new InputBag();
diff --git a/src/Titon/Console/Console.hh b/src/Titon/Console/Console.hh
index 827e13e..2c10427 100644
--- a/src/Titon/Console/Console.hh
+++ b/src/Titon/Console/Console.hh
@@ -12,6 +12,7 @@ use Titon\Console\Input;
 use Titon\Console\Output;
 use Titon\Console\InputDefinition\Flag;
 use ReflectionClass;
+use Titon\Kernel\Application;
 
 /**
  * The `Console` class bootstraps and handles Input and Output to process and
@@ -19,7 +20,7 @@ use ReflectionClass;
  *
  * @package Titon\Console
  */
-class Console {
+class Console implements Application {
 
     /**
      * A decorator banner to `brand` the application.
@@ -35,6 +36,13 @@ class Console {
      */
     protected ?Command $command;
 
+    /**
+     * Store added commands until we inject them into the `Input` at runtime.
+     *
+     * @var Vector<\Titon\Console\Command>
+     */
+    protected CommandList $commands = Vector {};
+
     /**
      * The `Input` object used to retrieve parsed parameters and commands.
      *
@@ -65,6 +73,9 @@ class Console {
 
     /**
      * Construct a new `Console` application.
+     *
+     * @param \Titon\Console\Input|null $input  The `Input` object to inject
+     * @param \Titon\Console\Output|null $input The `Output` object to inject
      */
     public function __construct(?Input $input = null, ?Output $output = null) {
         if (is_null($input)) {
@@ -82,20 +93,12 @@ class Console {
     /**
      * Add a `Command` to the application to be parsed by the `Input`.
      *
-     * @param Command $command  The `Command` object to add
+     * @param \Titon\Console\Command $command   The `Command` object to add
      *
      * @return $this
      */
-    public function addCommand(string $command): this {
-        $command = new ReflectionClass($command);
-        $command = $command->newInstance($this->input, $this->output);
-
-        try {
-            $this->input->addCommand($command);
-        } catch (Exception $e) {
-            $this->output->renderException($e);
-            $this->shutdown();
-        }
+    public function addCommand(Command $command): this {
+        $this->commands[] = $command;
 
         return $this;
     }
@@ -105,6 +108,18 @@ class Console {
      * settings.
      */
     protected function bootstrap(): void {
+        foreach ($this->commands as $command) {
+            $command->setInput($this->input);
+            $command->setOutput($this->output);
+
+            try {
+                $this->input->addCommand($command);
+            } catch (Exception $e) {
+                $this->output->renderException($e);
+                $this->terminate();
+            }
+        }
+
         /*
          * Add global flags
          */
@@ -176,8 +191,18 @@ class Console {
 
     /**
      * Run the `Console` application.
+     *
+     * @param \Titon\Console\Input|null $input  The `Input` object to inject
+     * @param \Titon\Console\Output|null $input The `Output` object to inject
      */
-    public function run(): void {
+    public function run(?Input $input = null, ?Output $output = null): void {
+        if (!is_null($input)) {
+            $this->input = $input;
+        }
+        if (!is_null($output)) {
+            $this->output = $output;
+        }
+
         $this->bootstrap();
         $this->command = $this->input->getActiveCommand();
         if (is_null($this->command)) {
@@ -187,7 +212,7 @@ class Console {
             $this->runCommand($this->command);
         }
 
-        $this->shutdown();
+        $this->terminate();
     }
 
     /**
@@ -237,7 +262,7 @@ class Console {
             $command->run();
         } catch (Exception $e) {
             $this->output->renderException($e);
-            $this->shutdown();
+            $this->terminate();
         }
     }
 
@@ -295,9 +320,9 @@ class Console {
     }
 
     /**
-     * Shutdown method executed at the end of the application's run.
+     * Termination method executed at the end of the application's run.
      */
-    protected function shutdown(): void {
+    protected function terminate(): void {
         exit(1);
     }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/Feedback/ProgressBarFeedback.hh b/src/Titon/Console/Feedback/ProgressBarFeedback.hh
index e10dc48..69594c8 100644
--- a/src/Titon/Console/Feedback/ProgressBarFeedback.hh
+++ b/src/Titon/Console/Feedback/ProgressBarFeedback.hh
@@ -59,6 +59,10 @@ class ProgressBarFeedback extends AbstractFeedback {
             'suffix'   => $suffix
         };
 
+        if ($this->output->getAnsiAllowed() === false) {
+            return;
+        }
+
         $eol = Output::CR;
         if ($finish === true) {
             $eol = Output::LF;
diff --git a/src/Titon/Console/Feedback/WaitFeedback.hh b/src/Titon/Console/Feedback/WaitFeedback.hh
index baddd1e..26faa50 100644
--- a/src/Titon/Console/Feedback/WaitFeedback.hh
+++ b/src/Titon/Console/Feedback/WaitFeedback.hh
@@ -64,6 +64,10 @@ class WaitFeedback extends AbstractFeedback {
             'suffix'   => $suffix
         };
 
+        if ($this->output->getAnsiAllowed() === false) {
+            return;
+        }
+
         $eol = Output::CR;
         if ($finish === true) {
             $eol = Output::LF;
diff --git a/src/Titon/Console/Input.hh b/src/Titon/Console/Input.hh
index f8c5e24..3f51b67 100644
--- a/src/Titon/Console/Input.hh
+++ b/src/Titon/Console/Input.hh
@@ -7,8 +7,9 @@
 
 namespace Titon\Console;
 
-use Titon\Console\InputDefinition\AbstractInputDefinition;
 use Titon\Utility\State\Server;
+use Titon\Kernel\Input as KernelInput;
+use Titon\Console\InputDefinition\AbstractInputDefinition;
 use Titon\Console\InputDefinition\Argument;
 use Titon\Console\InputDefinition\Flag;
 use Titon\Console\InputDefinition\Option;
@@ -23,7 +24,7 @@ use Titon\Console\Exception\InvalidInputDefinitionException;
  *
  * @package Titon\Console
  */
-class Input {
+class Input implements KernelInput {
 
     const string STREAM_STDIN = 'php://stdin';
 
diff --git a/src/Titon/Console/Output.hh b/src/Titon/Console/Output.hh
index ede2c80..6addcb2 100644
--- a/src/Titon/Console/Output.hh
+++ b/src/Titon/Console/Output.hh
@@ -8,6 +8,7 @@
 namespace Titon\Console;
 
 use Exception;
+use Titon\Kernel\Output as KernelOutput;
 use Titon\Console\System\SystemFactory;
 
 /**
@@ -15,7 +16,7 @@ use Titon\Console\System\SystemFactory;
  *
  * @package Titon\Console
  */
-class Output {
+class Output implements KernelOutput {
 
     const int VERBOSITY_QUIET = 0;
     const int VERBOSITY_NORMAL = 1;
@@ -119,7 +120,7 @@ class Output {
         $output = $this->format($output);
         $output .= str_repeat("\n", $newLines);
 
-        $this->send($output, $this->stderr);
+        fwrite($this->stderr, $output);
     }
 
     /**
@@ -147,14 +148,7 @@ class Output {
         $retval = $message;
         foreach ($parsedTags as $xmlTag) {
             if (!is_null($this->styles->get($xmlTag))) {
-                $outputAnsi = false;
-                if ($this->forceAnsi === true) {
-                    $outputAnsi = true;
-                } else if ($this->suppressAnsi === true) {
-                    $outputAnsi = false;
-                } else if (SystemFactory::factory()->supportsAnsi() === true) {
-                    $outputAnsi = true;
-                }
+                $outputAnsi = $this->getAnsiAllowed();
 
                 $style = $this->styles[$xmlTag];
                 $retval = $style->format($xmlTag, $retval, $outputAnsi);
@@ -173,6 +167,19 @@ class Output {
         return $retval;
     }
 
+    public function getAnsiAllowed(): bool {
+        $allowed = false;
+        if ($this->forceAnsi === true) {
+            $allowed = true;
+        } else if ($this->suppressAnsi === true) {
+            $allowed = false;
+        } else if (SystemFactory::factory()->supportsAnsi() === true) {
+            $allowed = true;
+        }
+
+        return $allowed;
+    }
+
     /**
      * Create and return the singleton instance.
      *
@@ -202,7 +209,7 @@ class Output {
         $output = $this->format($output);
         $output .= str_repeat($newlineChar, $newLines);
 
-        $this->send($output, $this->stdout);
+        fwrite($this->stdout, $output);
     }
 
     /**
@@ -249,13 +256,10 @@ class Output {
     }
 
     /**
-     * Send the response through the given output stream.
-     *
-     * @param string   $response    The contents to send
-     * @param resource $stream      The output stream
+     * Currently unused: Send the response through the given output stream.
      */
-    protected function send(string $response, resource $stream): void {
-        fwrite($stream, $response);
+    public function send(): void {
+
     }
 
     /**
diff --git a/src/Titon/Console/bootstrap.hh b/src/Titon/Console/bootstrap.hh
index f9d196b..d8e4c4d 100644
--- a/src/Titon/Console/bootstrap.hh
+++ b/src/Titon/Console/bootstrap.hh
@@ -16,6 +16,7 @@
 namespace Titon\Console {
 
     type CommandMap = Map<string, Command>;
+    type CommandList = Vector<Command>;
     type FeedbackVariables = shape(
         'message'   => string,
         'percent'   => int,
diff --git a/src/Titon/Console/composer.json b/src/Titon/Console/composer.json
index 8a0b2a8..cdef2fa 100644
--- a/src/Titon/Console/composer.json
+++ b/src/Titon/Console/composer.json
@@ -22,6 +22,7 @@
   "require": {
     "hhvm": ">=3.4.0",
     "titon/utility": "*",
+    "titon/kernel": "*"
   },
   "autoload": {
     "psr-4": {

From 987cb4fe563c7bf1601390da9552c2affb97736d Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Sun, 15 Mar 2015 15:14:54 -0400
Subject: [PATCH 72/92] initial commit

---
 src/Titon/Console/Kernel.hh | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 src/Titon/Console/Kernel.hh

diff --git a/src/Titon/Console/Kernel.hh b/src/Titon/Console/Kernel.hh
new file mode 100644
index 0000000..be56d57
--- /dev/null
+++ b/src/Titon/Console/Kernel.hh
@@ -0,0 +1,19 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console;
+
+use Titon\Kernel\AbstractKernel;
+
+class Kernel extends AbstractKernel<Input, Output> {
+
+    public function handle(): void {
+        $this->getApplication()->run();
+
+        return $this->getApplication()->getOutput();
+    }
+}
\ No newline at end of file

From 4fd6e7030700dadfb0d8e6f01a9303bb01f5239c Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Sun, 15 Mar 2015 15:30:05 -0400
Subject: [PATCH 73/92] adjusted run command so that we always return an exit
 code, kernel adjusted for new updates to its package

---
 src/Titon/Console/Console.hh | 44 ++++++++++++++++--------------------
 src/Titon/Console/Kernel.hh  | 12 ++++++----
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/Titon/Console/Console.hh b/src/Titon/Console/Console.hh
index 2c10427..d6019ee 100644
--- a/src/Titon/Console/Console.hh
+++ b/src/Titon/Console/Console.hh
@@ -111,13 +111,7 @@ class Console implements Application {
         foreach ($this->commands as $command) {
             $command->setInput($this->input);
             $command->setOutput($this->output);
-
-            try {
-                $this->input->addCommand($command);
-            } catch (Exception $e) {
-                $this->output->renderException($e);
-                $this->terminate();
-            }
+            $this->input->addCommand($command);
         }
 
         /*
@@ -195,7 +189,7 @@ class Console implements Application {
      * @param \Titon\Console\Input|null $input  The `Input` object to inject
      * @param \Titon\Console\Output|null $input The `Output` object to inject
      */
-    public function run(?Input $input = null, ?Output $output = null): void {
+    public function run(?Input $input = null, ?Output $output = null): int {
         if (!is_null($input)) {
             $this->input = $input;
         }
@@ -203,16 +197,23 @@ class Console implements Application {
             $this->output = $output;
         }
 
-        $this->bootstrap();
-        $this->command = $this->input->getActiveCommand();
-        if (is_null($this->command)) {
-            $this->input->parse();
-            $this->renderHelpScreen();
-        } else {
-            $this->runCommand($this->command);
+        try {
+            $this->bootstrap();
+            $this->command = $this->input->getActiveCommand();
+
+            if (is_null($this->command)) {
+                $this->input->parse();
+                $this->renderHelpScreen();
+            } else {
+                $this->runCommand($this->command);
+            }
+        } catch (Exception $e) {
+            $this->output->renderException($e);
+
+            return $this->shutdown(1);
         }
 
-        $this->terminate();
+        return $this->shutdown(0);
     }
 
     /**
@@ -258,12 +259,7 @@ class Console implements Application {
             $this->output->setVerbosity($verbosity);
         }
 
-        try {
-            $command->run();
-        } catch (Exception $e) {
-            $this->output->renderException($e);
-            $this->terminate();
-        }
+        $command->run()
     }
 
     /**
@@ -322,7 +318,7 @@ class Console implements Application {
     /**
      * Termination method executed at the end of the application's run.
      */
-    protected function terminate(): void {
-        exit(1);
+    protected function shutdown(int $exitCode): int {
+        return $exitCode;
     }
 }
\ No newline at end of file
diff --git a/src/Titon/Console/Kernel.hh b/src/Titon/Console/Kernel.hh
index be56d57..e8cf11f 100644
--- a/src/Titon/Console/Kernel.hh
+++ b/src/Titon/Console/Kernel.hh
@@ -8,12 +8,16 @@
 namespace Titon\Console;
 
 use Titon\Kernel\AbstractKernel;
+use Titon\Kernel\Middleware\Next;
 
-class Kernel extends AbstractKernel<Input, Output> {
+class Kernel extends AbstractKernel<Console, Input, Output> {
+    public function handle(Input $input, Output $output, Next<Input, Output> $next): Output {
+        $input->stack[] = 'kernel';
+        $output->ran = true;
 
-    public function handle(): void {
-        $this->getApplication()->run();
+        $this->exitCode = $this->getApplication()->run($input, $output);
 
-        return $this->getApplication()->getOutput();
+        // UNSAFE
+        return $output;
     }
 }
\ No newline at end of file

From a6f4ad69527d1b1efeb56e7032998689f6d2c2f9 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Mon, 16 Mar 2015 07:14:13 -0400
Subject: [PATCH 74/92] gah, missing semicolon

---
 src/Titon/Console/Console.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Titon/Console/Console.hh b/src/Titon/Console/Console.hh
index d6019ee..fd1f741 100644
--- a/src/Titon/Console/Console.hh
+++ b/src/Titon/Console/Console.hh
@@ -259,7 +259,7 @@ class Console implements Application {
             $this->output->setVerbosity($verbosity);
         }
 
-        $command->run()
+        $command->run();
     }
 
     /**

From 716e3d97968a3c96787d686790d2b983936d7989 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 17 Mar 2015 17:54:56 -0400
Subject: [PATCH 75/92] register input now clones the commands parameters and
 adds the inputs before registering them with the input. This allows the
 commands parameters to come before all registered global params for output,
 helpscreen, etc.

---
 src/Titon/Console/Command/AbstractCommand.hh | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/Titon/Console/Command/AbstractCommand.hh b/src/Titon/Console/Command/AbstractCommand.hh
index 455451f..2b342d0 100644
--- a/src/Titon/Console/Command/AbstractCommand.hh
+++ b/src/Titon/Console/Command/AbstractCommand.hh
@@ -299,15 +299,23 @@ abstract class AbstractCommand implements Command {
      * {@inheritdoc}
      */
     public function registerInput(): this {
-        foreach ($this->arguments as $name => $argument) {
-            $this->input->addArgument($argument);
+        $arguments = (new InputBag())->add($this->arguments->all());
+        foreach ($this->input->getArguments() as $name => $argument) {
+            $arguments[$name] = $argument;
         }
-        foreach ($this->flags as $name => $flag) {
-            $this->input->addFlag($flag);
+        $this->input->setArguments($arguments);
+
+        $flags = (new InputBag())->add($this->flags->all());
+        foreach ($this->input->getFlags() as $name => $flag) {
+            $flags->set($name, $flag);
         }
-        foreach ($this->options as $name => $option) {
-            $this->input->addOption($option);
+        $this->input->setFlags($flags);
+
+        $options = (new InputBag())->add($this->options->all());
+        foreach ($this->input->getOptions() as $name => $option) {
+            $options->set($name, $option);
         }
+        $this->input->setOptions($options);
 
         return $this;
     }

From ae75ffc488c2961179cfb658ee64ee20ef77e12d Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 17 Mar 2015 17:57:04 -0400
Subject: [PATCH 76/92] added methods to overrite and set all parameter bags

---
 src/Titon/Console/Input.hh | 39 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/src/Titon/Console/Input.hh b/src/Titon/Console/Input.hh
index 3f51b67..f7d55a8 100644
--- a/src/Titon/Console/Input.hh
+++ b/src/Titon/Console/Input.hh
@@ -519,6 +519,32 @@ class Input implements KernelInput {
         return true;
     }
 
+    /**
+     * Set the arguments of the `Input`. This will override all existing arguments.
+     *
+     * @param InputBag<Argument> $options The arguments to set
+     *
+     * @return $this
+     */
+    public function setArguments(InputBag<Argument> $arguments): this {
+        $this->arguments = $arguments;
+
+        return $this;
+    }
+
+    /**
+     * Set the flags of the `Input`. This will override all existing flags.
+     *
+     * @param InputBag<Flag> $options   The flags to set
+     *
+     * @return $this
+     */
+    public function setFlags(InputBag<Flag> $flags): this {
+        $this->flags = $flags;
+
+        return $this;
+    }
+
     /**
      * Set the input to be parsed.
      *
@@ -535,6 +561,19 @@ class Input implements KernelInput {
         return $this;
     }
 
+    /**
+     * Set the options of the `Input`. This will override all existing options.
+     *
+     * @param InputBag<Option> $options The options to set
+     *
+     * @return $this
+     */
+    public function setOptions(InputBag<Option> $options): this {
+        $this->options = $options;
+
+        return $this;
+    }
+
     /**
      * Set the strict value of the `Input`
      *

From ebf2da872d57cfa0df1a42269f841b0f206426c7 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Wed, 18 Mar 2015 18:01:20 -0400
Subject: [PATCH 77/92] removed unnecessary space before message

---
 src/Titon/Console/Feedback/WaitFeedback.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Titon/Console/Feedback/WaitFeedback.hh b/src/Titon/Console/Feedback/WaitFeedback.hh
index 26faa50..4a69602 100644
--- a/src/Titon/Console/Feedback/WaitFeedback.hh
+++ b/src/Titon/Console/Feedback/WaitFeedback.hh
@@ -31,7 +31,7 @@ class WaitFeedback extends AbstractFeedback {
     /**
      * {@inheritdoc}
      */
-    protected string $prefix = " {message}";
+    protected string $prefix = "{message}";
 
     /**
      * {@inheritdoc}

From 9f5e7359b173060ca59915870a5bb28106ded02f Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Mon, 23 Mar 2015 19:17:56 -0400
Subject: [PATCH 78/92] renamed `Console` to `Application`

---
 src/Titon/Console/Application.hh | 324 +++++++++++++++++++++++++++++++
 src/Titon/Console/Console.hh     | 318 +-----------------------------
 2 files changed, 333 insertions(+), 309 deletions(-)
 create mode 100644 src/Titon/Console/Application.hh

diff --git a/src/Titon/Console/Application.hh b/src/Titon/Console/Application.hh
new file mode 100644
index 0000000..7c91caa
--- /dev/null
+++ b/src/Titon/Console/Application.hh
@@ -0,0 +1,324 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console;
+
+use Exception;
+use Titon\Console\Input;
+use Titon\Console\Output;
+use Titon\Console\InputDefinition\Flag;
+use ReflectionClass;
+use Titon\Kernel\Application as KernelApplication;
+
+/**
+ * The `Application` class bootstraps and handles Input and Output to process and
+ * run necessary commands.
+ *
+ * @package Titon\Console
+ */
+class Application implements KernelApplication {
+
+    /**
+     * A decorator banner to `brand` the application.
+     *
+     * @var string
+     */
+    protected string $banner = '';
+
+    /**
+     * The `Command` object to run
+     *
+     * @var \Titon\Console\Command|null
+     */
+    protected ?Command $command;
+
+    /**
+     * Store added commands until we inject them into the `Input` at runtime.
+     *
+     * @var Vector<\Titon\Console\Command>
+     */
+    protected CommandList $commands = Vector {};
+
+    /**
+     * The `Input` object used to retrieve parsed parameters and commands.
+     *
+     * @var \Titon\Console\Input
+     */
+    protected Input $input;
+
+    /**
+     * The name of the application.
+     *
+     * @var string
+     */
+    protected string $name = '';
+
+    /**
+     * The `Output` object used to send response data to the user.
+     *
+     * @var \Titon\Console\Output
+     */
+    protected Output $output;
+
+    /**
+     * The version of the application.
+     *
+     * @var string
+     */
+    protected string $version = '';
+
+    /**
+     * Construct a new `Application` instance.
+     *
+     * @param \Titon\Console\Input|null $input  The `Input` object to inject
+     * @param \Titon\Console\Output|null $input The `Output` object to inject
+     */
+    public function __construct(?Input $input = null, ?Output $output = null) {
+        if (is_null($input)) {
+            $input = new Input();
+        }
+
+        if (is_null($output)) {
+            $output = new Output();
+        }
+
+        $this->input = $input;
+        $this->output = $output;
+    }
+
+    /**
+     * Add a `Command` to the application to be parsed by the `Input`.
+     *
+     * @param \Titon\Console\Command $command   The `Command` object to add
+     *
+     * @return $this
+     */
+    public function addCommand(Command $command): this {
+        $this->commands[] = $command;
+
+        return $this;
+    }
+
+    /**
+     * Bootstrap the `Application` instance with default parameters and global
+     * settings.
+     */
+    protected function bootstrap(): void {
+        foreach ($this->commands as $command) {
+            $command->setInput($this->input);
+            $command->setOutput($this->output);
+            $this->input->addCommand($command);
+        }
+
+        /*
+         * Add global flags
+         */
+        $this->input->addFlag((new Flag('help', 'Display this help screen.'))
+            ->alias('h'));
+        $this->input->addFlag((new Flag('quiet', 'Suppress all output.'))
+            ->alias('q'));
+        $this->input->addFlag((new Flag('verbose', 'Set the verbosity of the application\'s output.'))
+            ->alias('v')
+            ->setStackable(true));
+        $this->input->addFlag((new Flag('version', "Display the application's version"))
+            ->alias('V'));
+        $this->input->addFlag(new Flag('ansi', "Force ANSI output"));
+        $this->input->addFlag(new Flag('no-ansi', "Disable ANSI output"));
+
+        /*
+         * Add default styles
+         */
+        $this->output->setStyle('info', new StyleDefinition('green'));
+        $this->output->setStyle('warning', new StyleDefinition('yellow'));
+        $this->output->setStyle('error', new StyleDefinition('red'));
+        $this->output->setStyle('exception', new StyleDefinition('white', 'red'));
+    }
+
+    /**
+     * Retrieve the application's banner.
+     *
+     * @return string
+     */
+    public function getBanner(): string {
+        return $this->banner;
+    }
+
+    /**
+     * Retrieve the console's `Input` object.
+     *
+     * @return \Titon\Console\Input
+     */
+    public function getInput(): Input {
+        return $this->input;
+    }
+
+    /**
+     * Retrieve the application's name.
+     *
+     * @return string
+     */
+    public function getName(): string {
+        return $this->name;
+    }
+
+    /**
+     * Retrieve the console's `Output` object.
+     *
+     * @return \Titon\Console\Output
+     */
+    public function getOutput(): Output {
+        return $this->output;
+    }
+
+    /**
+     * Retrieve the application's version.
+     *
+     * @return string
+     */
+    public function getVersion(): string {
+        return $this->version;
+    }
+
+    /**
+     * Run the application.
+     *
+     * @param \Titon\Console\Input|null $input  The `Input` object to inject
+     * @param \Titon\Console\Output|null $input The `Output` object to inject
+     */
+    public function run(?Input $input = null, ?Output $output = null): int {
+        if (!is_null($input)) {
+            $this->input = $input;
+        }
+        if (!is_null($output)) {
+            $this->output = $output;
+        }
+
+        try {
+            $this->bootstrap();
+            $this->command = $this->input->getActiveCommand();
+
+            if (is_null($this->command)) {
+                $this->input->parse();
+                $this->renderHelpScreen();
+            } else {
+                $this->runCommand($this->command);
+            }
+        } catch (Exception $e) {
+            $this->output->renderException($e);
+
+            return $this->shutdown(1);
+        }
+
+        return $this->shutdown(0);
+    }
+
+    /**
+     * Register and run the `Command` object.
+     *
+     * @param Command $command  The `Command` to run
+     */
+    public function runCommand(Command $command): void {
+        $command->registerInput();
+        $this->input->parse();
+
+        if ($this->input->getFlag('help')->getValue() === 1) {
+            $this->renderHelpScreen($command);
+            return;
+        }
+
+        if ($this->input->getFlag('version')->getValue() === 1) {
+            $this->output->out("{$this->getName()} version {$this->getVersion()}");
+            return;
+        }
+
+        if ($this->input->getFlag('ansi')->getValue() === 1) {
+            $this->output->setForceAnsi(true);
+        } else if ($this->input->getFlag('no-ansi')->getValue() === 1) {
+            $this->output->setSuppressAnsi(true);
+        }
+
+        $flag = $this->input->getFlag('quiet');
+
+        $verbositySet = false;
+
+        if ($flag->exists()) {
+            $verbositySet = true;
+            $this->output->setVerbosity(0);
+        }
+
+        if ($verbositySet === false) {
+            $flag = $this->input->getFlag('verbose');
+            $verbosity = $flag->getValue(1);
+
+            invariant(!is_null($verbosity), "Must not be null.");
+
+            $this->output->setVerbosity($verbosity);
+        }
+
+        $command->run();
+    }
+
+    /**
+     * Render the help screen for the application or the `Command` passed in.
+     *
+     * @param \Titon\Console\Command|null $command  The `Command` to render usage for
+     */
+    public function renderHelpScreen(?Command $command = null): void {
+        $helpScreen = new HelpScreen($this);
+        if (!is_null($command)) {
+            $helpScreen->setCommand($command);
+        }
+
+        $this->output->out($helpScreen->render());
+    }
+
+    /**
+     * Set the banner of the application.
+     *
+     * @param string $banner    The banner decorator
+     *
+     * @return $this
+     */
+    public function setBanner(string $banner): this {
+        $this->banner = $banner;
+
+        return $this;
+    }
+
+    /**
+     * Set the name of the application.
+     *
+     * @param string $name  The name of the application
+     *
+     * @return $this
+     */
+    public function setName(string $name): this {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * Set the version of the application.
+     *
+     * @param string $version   The version of the application
+     *
+     * @return $this
+     */
+    public function setVersion(string $version): this {
+        $this->version = $version;
+
+        return $this;
+    }
+
+    /**
+     * Termination method executed at the end of the application's run.
+     */
+    protected function shutdown(int $exitCode): int {
+        return $exitCode;
+    }
+}
\ No newline at end of file
diff --git a/src/Titon/Console/Console.hh b/src/Titon/Console/Console.hh
index fd1f741..0dd5245 100644
--- a/src/Titon/Console/Console.hh
+++ b/src/Titon/Console/Console.hh
@@ -7,318 +7,18 @@
 
 namespace Titon\Console;
 
-use Exception;
-use Titon\Console\Input;
-use Titon\Console\Output;
-use Titon\Console\InputDefinition\Flag;
-use ReflectionClass;
-use Titon\Kernel\Application;
+use Titon\Kernel\AbstractKernel;
+use Titon\Kernel\Middleware\Next;
 
-/**
- * The `Console` class bootstraps and handles Input and Output to process and
- * run necessary commands.
- *
- * @package Titon\Console
- */
-class Console implements Application {
-
-    /**
-     * A decorator banner to `brand` the application.
-     *
-     * @var string
-     */
-    protected string $banner = '';
-
-    /**
-     * The `Command` object to run
-     *
-     * @var \Titon\Console\Command|null
-     */
-    protected ?Command $command;
-
-    /**
-     * Store added commands until we inject them into the `Input` at runtime.
-     *
-     * @var Vector<\Titon\Console\Command>
-     */
-    protected CommandList $commands = Vector {};
-
-    /**
-     * The `Input` object used to retrieve parsed parameters and commands.
-     *
-     * @var \Titon\Console\Input
-     */
-    protected Input $input;
-
-    /**
-     * The name of the application.
-     *
-     * @var string
-     */
-    protected string $name = '';
-
-    /**
-     * The `Output` object used to send response data to the user.
-     *
-     * @var \Titon\Console\Output
-     */
-    protected Output $output;
-
-    /**
-     * The version of the application.
-     *
-     * @var string
-     */
-    protected string $version = '';
-
-    /**
-     * Construct a new `Console` application.
-     *
-     * @param \Titon\Console\Input|null $input  The `Input` object to inject
-     * @param \Titon\Console\Output|null $input The `Output` object to inject
-     */
-    public function __construct(?Input $input = null, ?Output $output = null) {
-        if (is_null($input)) {
-            $input = new Input();
-        }
-
-        if (is_null($output)) {
-            $output = new Output();
-        }
-
-        $this->input = $input;
-        $this->output = $output;
-    }
-
-    /**
-     * Add a `Command` to the application to be parsed by the `Input`.
-     *
-     * @param \Titon\Console\Command $command   The `Command` object to add
-     *
-     * @return $this
-     */
-    public function addCommand(Command $command): this {
-        $this->commands[] = $command;
-
-        return $this;
-    }
-
-    /**
-     * Bootstrap the `Console` application with default parameters and global
-     * settings.
-     */
-    protected function bootstrap(): void {
-        foreach ($this->commands as $command) {
-            $command->setInput($this->input);
-            $command->setOutput($this->output);
-            $this->input->addCommand($command);
-        }
-
-        /*
-         * Add global flags
-         */
-        $this->input->addFlag((new Flag('help', 'Display this help screen.'))
-            ->alias('h'));
-        $this->input->addFlag((new Flag('quiet', 'Suppress all output.'))
-            ->alias('q'));
-        $this->input->addFlag((new Flag('verbose', 'Set the verbosity of the application\'s output.'))
-            ->alias('v')
-            ->setStackable(true));
-        $this->input->addFlag((new Flag('version', "Display the application's version"))
-            ->alias('V'));
-        $this->input->addFlag(new Flag('ansi', "Force ANSI output"));
-        $this->input->addFlag(new Flag('no-ansi', "Disable ANSI output"));
-
-        /*
-         * Add default styles
-         */
-        $this->output->setStyle('info', new StyleDefinition('green'));
-        $this->output->setStyle('warning', new StyleDefinition('yellow'));
-        $this->output->setStyle('error', new StyleDefinition('red'));
-        $this->output->setStyle('exception', new StyleDefinition('white', 'red'));
-    }
-
-    /**
-     * Retrieve the application's banner.
-     *
-     * @return string
-     */
-    public function getBanner(): string {
-        return $this->banner;
-    }
-
-    /**
-     * Retrieve the console's `Input` object.
-     *
-     * @return \Titon\Console\Input
-     */
-    public function getInput(): Input {
-        return $this->input;
-    }
-
-    /**
-     * Retrieve the application's name.
-     *
-     * @return string
-     */
-    public function getName(): string {
-        return $this->name;
-    }
-
-    /**
-     * Retrieve the console's `Output` object.
-     *
-     * @return \Titon\Console\Output
-     */
-    public function getOutput(): Output {
-        return $this->output;
-    }
-
-    /**
-     * Retrieve the application's version.
-     *
-     * @return string
-     */
-    public function getVersion(): string {
-        return $this->version;
-    }
-
-    /**
-     * Run the `Console` application.
-     *
-     * @param \Titon\Console\Input|null $input  The `Input` object to inject
-     * @param \Titon\Console\Output|null $input The `Output` object to inject
-     */
-    public function run(?Input $input = null, ?Output $output = null): int {
-        if (!is_null($input)) {
-            $this->input = $input;
-        }
-        if (!is_null($output)) {
-            $this->output = $output;
-        }
-
-        try {
-            $this->bootstrap();
-            $this->command = $this->input->getActiveCommand();
-
-            if (is_null($this->command)) {
-                $this->input->parse();
-                $this->renderHelpScreen();
-            } else {
-                $this->runCommand($this->command);
-            }
-        } catch (Exception $e) {
-            $this->output->renderException($e);
-
-            return $this->shutdown(1);
-        }
-
-        return $this->shutdown(0);
-    }
-
-    /**
-     * Register and run the `Command` object.
-     *
-     * @param Command $command  The `Command` to run
-     */
-    public function runCommand(Command $command): void {
-        $command->registerInput();
-        $this->input->parse();
-
-        if ($this->input->getFlag('help')->getValue() === 1) {
-            $this->renderHelpScreen($command);
-            return;
-        }
-
-        if ($this->input->getFlag('version')->getValue() === 1) {
-            $this->output->out("{$this->getName()} version {$this->getVersion()}");
-            return;
-        }
-
-        if ($this->input->getFlag('ansi')->getValue() === 1) {
-            $this->output->setForceAnsi(true);
-        } else if ($this->input->getFlag('no-ansi')->getValue() === 1) {
-            $this->output->setSuppressAnsi(true);
-        }
-
-        $flag = $this->input->getFlag('quiet');
-
-        $verbositySet = false;
-
-        if ($flag->exists()) {
-            $verbositySet = true;
-            $this->output->setVerbosity(0);
-        }
-
-        if ($verbositySet === false) {
-            $flag = $this->input->getFlag('verbose');
-            $verbosity = $flag->getValue(1);
+class Console extends AbstractKernel<Application, Input, Output> {
 
-            invariant(!is_null($verbosity), "Must not be null.");
+    public function handle(Input $input, Output $output, Next<Input, Output> $next): Output {
+        $input->stack[] = 'kernel';
+        $output->ran = true;
 
-            $this->output->setVerbosity($verbosity);
-        }
-
-        $command->run();
-    }
-
-    /**
-     * Render the help screen for the application or the `Command` passed in.
-     *
-     * @param \Titon\Console\Command|null $command  The `Command` to render usage for
-     */
-    public function renderHelpScreen(?Command $command = null): void {
-        $helpScreen = new HelpScreen($this);
-        if (!is_null($command)) {
-            $helpScreen->setCommand($command);
-        }
-
-        $this->output->out($helpScreen->render());
-    }
-
-    /**
-     * Set the banner of the application.
-     *
-     * @param string $banner    The banner decorator
-     *
-     * @return $this
-     */
-    public function setBanner(string $banner): this {
-        $this->banner = $banner;
-
-        return $this;
-    }
-
-    /**
-     * Set the name of the application.
-     *
-     * @param string $name  The name of the application
-     *
-     * @return $this
-     */
-    public function setName(string $name): this {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    /**
-     * Set the version of the application.
-     *
-     * @param string $version   The version of the application
-     *
-     * @return $this
-     */
-    public function setVersion(string $version): this {
-        $this->version = $version;
-
-        return $this;
-    }
+        $this->exitCode = $this->getApplication()->run($input, $output);
 
-    /**
-     * Termination method executed at the end of the application's run.
-     */
-    protected function shutdown(int $exitCode): int {
-        return $exitCode;
+        // UNSAFE
+        return $output;
     }
 }
\ No newline at end of file

From ac0d648023e924fd3b347c5364f6a1c0e1eefe23 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 31 Mar 2015 15:03:56 -0400
Subject: [PATCH 79/92] renamed `Console` to `Application`

---
 src/Titon/Console/HelpScreen.hh | 22 +++++++++++-----------
 src/Titon/Console/Kernel.hh     | 23 -----------------------
 2 files changed, 11 insertions(+), 34 deletions(-)
 delete mode 100644 src/Titon/Console/Kernel.hh

diff --git a/src/Titon/Console/HelpScreen.hh b/src/Titon/Console/HelpScreen.hh
index e37a419..8ffa713 100644
--- a/src/Titon/Console/HelpScreen.hh
+++ b/src/Titon/Console/HelpScreen.hh
@@ -14,7 +14,7 @@ use Titon\Console\InputDefinition\AbstractInputDefinition;
 
 /**
  * The `HelpScreen` class renders out a usage screen given the available `Flag`,
- * `Option`, and `Argument` objects avaiable as well as available commands that
+ * `Option`, and `Argument` objects available as well as available commands that
  * can be executed.
  *
  * @package Titon\Console
@@ -45,9 +45,9 @@ class HelpScreen {
     /**
      * The `Console` object to render a help screen for.
      *
-     * @var \Titon\Console\Console
+     * @var \Titon\Console\Application
      */
-    protected Console $console;
+    protected Application $app;
 
     /**
      * The available `Flag` objects accepted.
@@ -74,12 +74,12 @@ class HelpScreen {
     /**
      * Construct a new instance of the `HelpScreen`.
      *
-     * @param \Titon\Console\Input $input   The `Console` application
+     * @param \Titon\Console\Application $app   The `Console` application
      */
-    public function __construct(Console $console) {
-        $this->console = $console;
+    public function __construct(Application $app) {
+        $this->app = $app;
 
-        $input = $console->getInput();
+        $input = $app->getInput();
         $this->commands = $input->getCommands();
         $this->arguments = $input->getArguments();
         $this->flags = $input->getFlags();
@@ -207,13 +207,13 @@ class HelpScreen {
             } else {
                 $retval[] = $command->getName();
             }
-        } else if ($this->console->getName() !== '') {
-            if (($banner = $this->console->getBanner()) !== '') {
+        } else if ($this->app->getName() !== '') {
+            if (($banner = $this->app->getBanner()) !== '') {
                 $retval[] = $banner;
             }
 
-            $name = $this->console->getName();
-            if (($version = $this->console->getVersion()) !== '') {
+            $name = $this->app->getName();
+            if (($version = $this->app->getVersion()) !== '') {
                 $name .= " version $version";
             }
 
diff --git a/src/Titon/Console/Kernel.hh b/src/Titon/Console/Kernel.hh
deleted file mode 100644
index e8cf11f..0000000
--- a/src/Titon/Console/Kernel.hh
+++ /dev/null
@@ -1,23 +0,0 @@
-<?hh // strict
-/**
- * @copyright   2010-2015, The Titon Project
- * @license     http://opensource.org/licenses/bsd-license.php
- * @link        http://titon.io
- */
-
-namespace Titon\Console;
-
-use Titon\Kernel\AbstractKernel;
-use Titon\Kernel\Middleware\Next;
-
-class Kernel extends AbstractKernel<Console, Input, Output> {
-    public function handle(Input $input, Output $output, Next<Input, Output> $next): Output {
-        $input->stack[] = 'kernel';
-        $output->ran = true;
-
-        $this->exitCode = $this->getApplication()->run($input, $output);
-
-        // UNSAFE
-        return $output;
-    }
-}
\ No newline at end of file

From b60793d5c4e3eb5515dfc3eb401e1f7ea66f570a Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 31 Mar 2015 15:04:38 -0400
Subject: [PATCH 80/92] docs update

---
 docs/en/packages/console/application.md | 54 +++++++++++++++++++++++++
 docs/en/packages/console/console.md     | 34 ++++------------
 docs/en/packages/console/input.md       | 16 ++------
 3 files changed, 65 insertions(+), 39 deletions(-)
 create mode 100644 docs/en/packages/console/application.md

diff --git a/docs/en/packages/console/application.md b/docs/en/packages/console/application.md
new file mode 100644
index 0000000..4687026
--- /dev/null
+++ b/docs/en/packages/console/application.md
@@ -0,0 +1,54 @@
+# Application #
+
+See [`Console`](console.md) for more information on scaffolding and building applications.
+
+The `Console` object functions as the `application` of the console package. Used in conjuction with the `Console`, it provides all necessary scaffolding and setup for building and running CLI applications.
+
+## Construction ##
+
+Creating an application is as simple as constructing a new `Application` object and optionally passing in `Input` and `Output` objects. If no `Input` object is passed in, a new one is constructed using the global arguments provided by the PHP/Hack language.
+
+When used with the `Console`, the `Input` and `Output` objects will be replaced by those passed into the console's `run` method.
+
+```hack
+$app = new Console();
+```
+
+## Commands ##
+
+Once a new application has been created, add commands by calling `addCommand` and passing in a new instance of the command itself. The `Application` object will take care of setting up and configuring the `Command` as necessary.
+
+````hack
+$app->addCommand(new MyCommand());
+```
+
+## Running the Application ##
+
+Once all necessary commands have been added, calling `run` on the `Application` object will execute the application. Again, when used with the `Console` package, this is all handled when the `Console` itself is ran.
+
+```hack
+$app->run();
+```
+
+When executing the application from the command line, the `Application` object will handle the following situations:
+
+* If no command is provided or the `help` flag is present, the help screen of the application will be presented listing all global flags, global options, and available commands.
+* If a command is present and the `help` flag is present, the help screen of the given command will be presented listing all available options, flags, and arguments as well as the usage of the command and its description.
+* If the command is present with valid parameters, the application will execute the `run` command of the `Command`.
+
+## Automatic Setup ##
+
+The `Console` class will automatically bootstrap and set up global parameters and output styles ready for use. The following parameters are readily available:
+
+* --help (-h): The `help` flag to automatically render the help screen of the application or given command.
+* --quiet (-q): Set the verbosity of the application to 0, suppressing all output.
+* --verbose (-v) [stackable]: Set the verbosity level of the application. This is stackable, so each instance of `v` will increase the verbosity level by 1.
+* --ansi: Force ANSI output
+* --no-ansi: Suppress all ANSI output
+
+The following style tags are also readily available for formatting output (see [`StyleDefinition`](style-definition.md) for more information):
+
+* `<info>`: Green text, default background
+* `<warning>`: Yellow text, default background
+* `<error>`: Red text, default background
+* `<exception>`: White text, red background
diff --git a/docs/en/packages/console/console.md b/docs/en/packages/console/console.md
index c93c221..dd00130 100644
--- a/docs/en/packages/console/console.md
+++ b/docs/en/packages/console/console.md
@@ -1,33 +1,15 @@
 # Console #
 
-The `Console` object functions as the `application` of the console package.
+The `Console` handles bootstrapping and running the `Application` object as well as providing all functionality that the [Kernel]() package provides.
 
-## Construction ##
+## Setup ##
 
-Creating an application is as simple as constructing a new `Console` object and optionally passing in `Input` and `Output` objects. If no `Input` object is passed in, a new one is constructed using the global arguments provided by the PHP/Hack language.
+Setup of a new `Console` object (new CLI applications) is very simple. Since `Console` extends `Kernel`, we are required to pass in the `Application` as well as a new pipeline. Once the `Console` is ready to be ran, an `Input` and `Output` object is also required for handling all user input from the terminal and handling formatting output.
 
-```hack
-$app = new Console();
-```
-
-## Commands ##
-
-Once a new application has been created, add commands by calling `addCommand` and passing in a new instance of the command itself. The `Console` object will take care of setting up and configuring the `Command` as necessary.
-
-````hack
-$app->addCommand(new MyCommand());
-```
-
-## Running the Application ##
-
-Once all necessary commands have been added, calling `run` on the `Console` object will execute the application.
+The `Pipeline` object handles management of middleware through queue data structures providing 
 
 ```hack
-$app->run();
-```
-
-When executing the application from the command line, the `Console` object will handle the following situations:
-
-* If no command is provided or the `help` flag is present, the help screen of the application will be presented listing all global flags, global options, and available commands.
-* If a command is present and the `help` flag is present, the help screen of the given command will be presented listing all available options, flags, and arguments as well as the usage of the command and its description.
-* If the command is present with valid parameters, the `Console` application will execute the `run` command of the `Command`.
+$app = new \Titon\Console\Application();
+$kernel = new Console($app, new \Titon\Kernel\Middleware\Pipeline());
+$kernel->run(new \Titon\Console\Input(), new \Titon\Console\Output());
+$kernel->terminate();
diff --git a/docs/en/packages/console/input.md b/docs/en/packages/console/input.md
index d684aec..688fc20 100644
--- a/docs/en/packages/console/input.md
+++ b/docs/en/packages/console/input.md
@@ -6,16 +6,6 @@ All user input is handled by the `Input` class. This is where you define all inp
 
 Parameters are any input given by the user into the command line application. The supported types of parameters are flags, options, arguments, and commands.
 
-#### Default Values ####
-
-All parameters share many attributes and functionality. A default value (initially `null`), can be assigned to each parameter that will pose as its returned value if no input is given by the user.
-
-```hack
-$param->setDefault('yes');
-```
-
-Using `getValue` on any parameter will return the default value assigned if no value is given. An easy way to determine if a parameter has been specified by the user is to use the `exists` method. This will return true if a value has been assigned to the parameter by the user, false otherwise.
-
 #### Description ####
 
 The (optional) description of each parameter can also be set either in its constructor or via a `setter` method. This description is used when rendering the help screen.
@@ -34,7 +24,7 @@ $param = (new Flag('foo'))->alias('f');
 
 #### Mode ####
 
-The `mode` of a parameter applies to all types: flags, options, and arguments. The mode determines if user input is required for the paramter. If no input is given and the mode is set to be required, then an exception will be thrown.
+The `mode` determines if user input is required for the paramter. If no input is given and the mode is set to be required, then an exception will be thrown.
 
 The `mode` is set at construction or through a `setter` method. By default, all parameters are set to optional.
 
@@ -44,9 +34,9 @@ $param->setMode(AbstractInputDefinition::MODE_REQUIRED);
 
 ### Flags ###
 
-A `Flag` is a `boolean` flag that is only checked by the parser for its existence. If the flag is present, it is given a value of 1 and a value of 0 is given if it is not.
+A `Flag` is a boolean flag that is only checked by the parser for its existence. If the flag is present, it is given a value of 1 and a value of 0 is given if it is not.
 
-**NOTE:** Although we say its a `boolean` parameter, that only means the parser does not attempt to give the parameter a value read from the user input. The `value` assigned to flags are actually numeric to allow for stackable flags.
+**NOTE:** Although we say its a `boolean` parameter, that only means the parser does not attempt to give the parameter a value read from the user input. It only checks for the parameter's existence. The `value` assigned to flags are actually numeric to allow for stackable flags.
 
 A flag is added to the `Input` object via the `addFlag` method.
 

From cc2fa540caf8e70e60a85cb010d984383ae0371a Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Thu, 2 Apr 2015 10:37:22 -0400
Subject: [PATCH 81/92] updated ascii tree output appearance

---
 src/Titon/Console/Tree/AsciiTree.hh | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/Titon/Console/Tree/AsciiTree.hh b/src/Titon/Console/Tree/AsciiTree.hh
index e741eec..f3fe21f 100644
--- a/src/Titon/Console/Tree/AsciiTree.hh
+++ b/src/Titon/Console/Tree/AsciiTree.hh
@@ -29,13 +29,29 @@ class AsciiTree extends AbstractTree {
         $keys = array_keys($tree);
         $branch = array_values($tree);
         for ($i = 0, $count = count($branch); $i < $count; ++$i) {
+            $itemPrefix = $prefix;
+            $next = $branch[$i];
+
+            if ($i === $count - 1) {
+                if (is_array($next)) {
+                    $itemPrefix .= '└─┬';
+                } else {
+                    $itemPrefix .= '└──';
+                }
+            } else {
+                if (is_array($next)) {
+                    $itemPrefix .= '├─┬';
+                } else {
+                    $itemPrefix .= '├──';
+                }
+            }
+
             if (is_array($branch[$i])) {
-                $retval[] = $prefix . '+-' . (string)$keys[$i];
+                $retval[] = $itemPrefix . (string)$keys[$i];
             } else {
-                $retval[] = $prefix . '+-' . (string)$branch[$i];
+                $retval[] = $itemPrefix . (string)$branch[$i];
             }
 
-            $next = $branch[$i];
             if (is_array($next)) {
                 $retval[] = $this->build($next, $prefix . ($i == $count - 1 ? '  ' : '| '));
             }

From 874e7c0099ba4bfa6ac67ecb0cf8bfe42805c721 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Sat, 4 Apr 2015 13:37:06 -0400
Subject: [PATCH 82/92] added method to specifically render version information

---
 src/Titon/Console/Application.hh | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/Titon/Console/Application.hh b/src/Titon/Console/Application.hh
index 7c91caa..8a0e534 100644
--- a/src/Titon/Console/Application.hh
+++ b/src/Titon/Console/Application.hh
@@ -203,7 +203,11 @@ class Application implements KernelApplication {
 
             if (is_null($this->command)) {
                 $this->input->parse();
-                $this->renderHelpScreen();
+                if ($this->input->getFlag('version')->getValue() === 1) {
+                    $this->renderVersionInformation();
+                } else {
+                    $this->renderHelpScreen();
+                }
             } else {
                 $this->runCommand($this->command);
             }
@@ -231,7 +235,8 @@ class Application implements KernelApplication {
         }
 
         if ($this->input->getFlag('version')->getValue() === 1) {
-            $this->output->out("{$this->getName()} version {$this->getVersion()}");
+            $this->renderVersionInformation();
+
             return;
         }
 
@@ -276,6 +281,15 @@ class Application implements KernelApplication {
         $this->output->out($helpScreen->render());
     }
 
+    /**
+     * Output version information of the current `Application`.
+     */
+    public function renderVersionInformation(): void {
+        if ($this->getVersion()) {
+            $this->output->out("{$this->getName()} version {$this->getVersion()}");
+        }
+    }
+
     /**
      * Set the banner of the application.
      *

From 6e5662e19d97ebecd9be32a76bca642368c2fb7b Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Sat, 4 Apr 2015 13:37:16 -0400
Subject: [PATCH 83/92] added missing doc block

---
 src/Titon/Console/Console.hh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Titon/Console/Console.hh b/src/Titon/Console/Console.hh
index 0dd5245..894eb4c 100644
--- a/src/Titon/Console/Console.hh
+++ b/src/Titon/Console/Console.hh
@@ -12,6 +12,9 @@ use Titon\Kernel\Middleware\Next;
 
 class Console extends AbstractKernel<Application, Input, Output> {
 
+    /**
+     * {@inheritdoc}
+     */
     public function handle(Input $input, Output $output, Next<Input, Output> $next): Output {
         $input->stack[] = 'kernel';
         $output->ran = true;

From c9f5f482d1cd8fd03f212f83c81c23b20647e1e7 Mon Sep 17 00:00:00 2001
From: Miles Johnson <mileswjohnson@gmail.com>
Date: Mon, 6 Apr 2015 19:17:26 -0700
Subject: [PATCH 84/92] Quick polish while testing.

---
 Vagrantfile                                  |  1 -
 src/Titon/Console/Application.hh             |  4 +-
 src/Titon/Console/Console.hh                 |  6 +--
 src/Titon/Console/HelpScreen.hh              |  4 +-
 src/Titon/Console/Tree/AsciiTree.hh          | 10 ++---
 tests/Titon/Test/Stub/Console/CommandStub.hh | 41 ++++++++++----------
 tests/console.hh                             | 33 ++++++++++++++++
 7 files changed, 64 insertions(+), 35 deletions(-)
 create mode 100644 tests/console.hh

diff --git a/Vagrantfile b/Vagrantfile
index 0afa153..60a2a54 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -6,7 +6,6 @@ Vagrant.configure("2") do |config|
 
     # Increase memory size as HHVM requires at minimum 1GB
     config.vm.provider "virtualbox" do |v|
-        v.name = "titon"
         v.memory = 2048
         v.cpus = 2
         v.customize ["modifyvm", :id, "--ostype", "Ubuntu_64"]
diff --git a/src/Titon/Console/Application.hh b/src/Titon/Console/Application.hh
index 8a0e534..82fad5a 100644
--- a/src/Titon/Console/Application.hh
+++ b/src/Titon/Console/Application.hh
@@ -286,7 +286,7 @@ class Application implements KernelApplication {
      */
     public function renderVersionInformation(): void {
         if ($this->getVersion()) {
-            $this->output->out("{$this->getName()} version {$this->getVersion()}");
+            $this->output->out("{$this->getName()} v{$this->getVersion()}");
         }
     }
 
@@ -335,4 +335,4 @@ class Application implements KernelApplication {
     protected function shutdown(int $exitCode): int {
         return $exitCode;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Titon/Console/Console.hh b/src/Titon/Console/Console.hh
index 894eb4c..9835ba9 100644
--- a/src/Titon/Console/Console.hh
+++ b/src/Titon/Console/Console.hh
@@ -16,12 +16,8 @@ class Console extends AbstractKernel<Application, Input, Output> {
      * {@inheritdoc}
      */
     public function handle(Input $input, Output $output, Next<Input, Output> $next): Output {
-        $input->stack[] = 'kernel';
-        $output->ran = true;
-
         $this->exitCode = $this->getApplication()->run($input, $output);
 
-        // UNSAFE
         return $output;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Titon/Console/HelpScreen.hh b/src/Titon/Console/HelpScreen.hh
index 8ffa713..9177299 100644
--- a/src/Titon/Console/HelpScreen.hh
+++ b/src/Titon/Console/HelpScreen.hh
@@ -214,7 +214,7 @@ class HelpScreen {
 
             $name = $this->app->getName();
             if (($version = $this->app->getVersion()) !== '') {
-                $name .= " version $version";
+                $name .= " v$version";
             }
 
             $retval[] = $name;
@@ -419,4 +419,4 @@ class HelpScreen {
 
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Titon/Console/Tree/AsciiTree.hh b/src/Titon/Console/Tree/AsciiTree.hh
index f3fe21f..257645f 100644
--- a/src/Titon/Console/Tree/AsciiTree.hh
+++ b/src/Titon/Console/Tree/AsciiTree.hh
@@ -34,15 +34,15 @@ class AsciiTree extends AbstractTree {
 
             if ($i === $count - 1) {
                 if (is_array($next)) {
-                    $itemPrefix .= '└─┬';
+                    $itemPrefix .= '└─┬ ';
                 } else {
-                    $itemPrefix .= '└──';
+                    $itemPrefix .= '└── ';
                 }
             } else {
                 if (is_array($next)) {
-                    $itemPrefix .= '├─┬';
+                    $itemPrefix .= '├─┬ ';
                 } else {
-                    $itemPrefix .= '├──';
+                    $itemPrefix .= '├── ';
                 }
             }
 
@@ -59,4 +59,4 @@ class AsciiTree extends AbstractTree {
 
         return implode("\n", $retval);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Titon/Test/Stub/Console/CommandStub.hh b/tests/Titon/Test/Stub/Console/CommandStub.hh
index 464419c..d67bfd2 100644
--- a/tests/Titon/Test/Stub/Console/CommandStub.hh
+++ b/tests/Titon/Test/Stub/Console/CommandStub.hh
@@ -8,8 +8,8 @@
 namespace Titon\Test\Stub\Console;
 
 use Titon\Console\Command\AbstractCommand;
-use Titon\Console\Feedback\ProgressBar;
-use Titon\Console\Feedback\Wait;
+use Titon\Console\Feedback\ProgressBarFeedback;
+use Titon\Console\Feedback\WaitFeedback;
 use Titon\Console\InputDefinition\Argument;
 use Titon\Console\InputDefinition\Option;
 use Titon\Console\InputDefinition\Flag;
@@ -30,25 +30,25 @@ class CommandStub extends AbstractCommand {
         $this->addFlag(new Flag('greet', 'Output a friendly greeting!'));
         $this->addArgument(new Argument('name', 'The name of the person I am greeting.'));
 
-        $this->addOption(new Option('feedback', "Display either a `progress` bar or a `spinner`."));
+        $this->addOption(new Option('feedback', 'Display either a `progress` bar or a `spinner`.'));
 
         $this->addFlag(new Flag('menu', 'Present a menu to help guide you through the examples.'));
     }
 
     public function run(): void {
         if (($type = $this->getOption('tree', '')) !== '') {
-            invariant(is_string($type), "Must be a string.");
+            invariant(is_string($type), 'Must be a string.');
             $this->runTreeExample($type);
         } else if ($this->getFlag('table') === 1) {
             $this->runTableExample();
         } else if ($this->getFlag('greet')) {
             if (($name = $this->getArgument('name', '')) !== '') {
-                $this->out(sprintf("Hello, %s!", $name));
+                $this->out(sprintf('Hello, %s!', $name));
             } else {
-                $this->out("Hello, world!");
+                $this->out('Hello, world!');
             }
         } else if (($type = $this->getOption('feedback', '')) !== '') {
-            invariant(is_string($type), "Must be a string.");
+            invariant(is_string($type), 'Must be a string.');
             $this->runFeedbackExample($type);
         } else if ($this->getFlag('menu')) {
             $this->runUserInputExamples();
@@ -123,7 +123,7 @@ class CommandStub extends AbstractCommand {
         } else if ($type === 'markdown') {
             $tree = new MarkdownTree($data);
         } else {
-            $this->error(sprintf("The table type %s is not supported.", $type));
+            $this->error(sprintf('The table type %s is not supported.', $type));
 
             return;
         }
@@ -138,16 +138,17 @@ class CommandStub extends AbstractCommand {
         }
 
         $menu = $this->menu(Map {
-            "0" => 'ASCII Tree',
-            "1" => 'Markdown Tree',
-            "2" => 'Table',
-            "3" => 'Gretting',
-            "4" => 'Progress bar',
-            "5" => 'Spinner',
-            "6" => 'Repeat this menu',
-            "7" => 'Quit'
-        }, "Please select from the options below");
-        $answer = $menu->prompt("Enter a selection");
+            '0' => 'ASCII Tree',
+            '1' => 'Markdown Tree',
+            '2' => 'Table',
+            '3' => 'Greeting',
+            '4' => 'Progress bar',
+            '5' => 'Spinner',
+            '6' => 'Repeat this menu',
+            '7' => 'Quit'
+        }, 'Please select from the options below');
+
+        $answer = $menu->prompt('Enter a selection:');
 
         switch ((int)$answer) {
             case 0:
@@ -160,7 +161,7 @@ class CommandStub extends AbstractCommand {
                 $this->runTableExample();
                 break;
             case 3:
-                $this->out("Hello, world!");
+                $this->out('Hello, world!');
                 break;
             case 4:
                 $this->runFeedbackExample('progress');
@@ -176,4 +177,4 @@ class CommandStub extends AbstractCommand {
                 return;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/console.hh b/tests/console.hh
new file mode 100644
index 0000000..d5bd1f9
--- /dev/null
+++ b/tests/console.hh
@@ -0,0 +1,33 @@
+<?hh
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+require '../vendor/autoload.php';
+
+use Titon\Console\Application;
+use Titon\Console\Console;
+use Titon\Console\Input;
+use Titon\Console\Output;
+use Titon\Kernel\Middleware\Pipeline;use Titon\Test\Stub\Console\CommandStub;
+
+$banner = <<<'BANNER'
+ ______  ______   ______   __    __   ______   __    __   ______   ______   __  __
+/\  ___\/\  __ \ /\  __ \ /\ '-./  \ /\  ___\ /\ \ __\ \ /\  __ \ /\  __ \ /\ \/ /_
+\ \  __\\ \  __< \ \  __ \\ \ \._/\ \\ \  __\ \ \ \| \\ \\ \ \/\ \\ \  __< \ \  _  \
+ \ \_\/  \ \_\ \_\\ \_\ \_\\ \_\/\ \_\\ \_____\\ \__/_.__\\ \_____\\ \_\ \_\\ \_\ \_\
+  \/_/    \/_/\/_/ \/_/\/_/ \/_/  \/_/ \/_____/ \/_/  \/_/ \/_____/ \/_/\/_/ \/_/\/_/
+
+BANNER;
+
+$application = new Application();
+$application->setName('Titon Framework');
+$application->setVersion(file_get_contents('../version.md'));
+$application->setBanner($banner);
+$application->addCommand(new CommandStub());
+
+$console = new Console($application, new Pipeline());
+$console->run(new Input(), new Output());
+$console->terminate();

From 2487223efabc2c426e57096041010e6fd4405e28 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 7 Apr 2015 08:26:28 -0400
Subject: [PATCH 85/92] added doc block and removed testing code

---
 src/Titon/Console/Console.hh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Titon/Console/Console.hh b/src/Titon/Console/Console.hh
index 894eb4c..e4d24fb 100644
--- a/src/Titon/Console/Console.hh
+++ b/src/Titon/Console/Console.hh
@@ -10,18 +10,19 @@ namespace Titon\Console;
 use Titon\Kernel\AbstractKernel;
 use Titon\Kernel\Middleware\Next;
 
+/**
+ * The `Console` class acts as the `Kernel` of a CLI application.
+ *
+ * @package Titon\Console
+ */
 class Console extends AbstractKernel<Application, Input, Output> {
 
     /**
      * {@inheritdoc}
      */
     public function handle(Input $input, Output $output, Next<Input, Output> $next): Output {
-        $input->stack[] = 'kernel';
-        $output->ran = true;
-
         $this->exitCode = $this->getApplication()->run($input, $output);
 
-        // UNSAFE
         return $output;
     }
-}
\ No newline at end of file
+}

From 1b48d13e24dc11f6be411da1e063181f62d74298 Mon Sep 17 00:00:00 2001
From: Alex Phillips <exonintrendo@gmail.com>
Date: Tue, 7 Apr 2015 08:26:50 -0400
Subject: [PATCH 86/92] removed Input/Output dependencies on the constructor

---
 src/Titon/Console/Command/AbstractCommand.hh | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/Titon/Console/Command/AbstractCommand.hh b/src/Titon/Console/Command/AbstractCommand.hh
index 2b342d0..aac6234 100644
--- a/src/Titon/Console/Command/AbstractCommand.hh
+++ b/src/Titon/Console/Command/AbstractCommand.hh
@@ -80,20 +80,8 @@ abstract class AbstractCommand implements Command {
 
     /**
      * Construct a new instance of a command.
-     *
-     * @param \Titon\Console\Input|null $input  The `Input` object to inject
-     * @param \Titon\Console\Output|null $input The `Output` object to inject
      */
-    public function __construct(?Input $input = null, ?Output $output = null) {
-        if (is_null($input)) {
-            $input = new Input();
-        }
-        if (is_null($output)) {
-            $output = new Output();
-        }
-
-        $this->input = $input;
-        $this->output = $output;
+    public function __construct() {
         $this->arguments = new InputBag();
         $this->flags = new InputBag();
         $this->options = new InputBag();

From 0baab59d56e1bbbd1d32f0995c7325e47df37071 Mon Sep 17 00:00:00 2001
From: Miles Johnson <mileswjohnson@gmail.com>
Date: Tue, 23 Jun 2015 22:34:06 -0700
Subject: [PATCH 87/92] Updated composer. Added readme.

---
 composer.lock                   | 39 +++++++++-----------
 src/Titon/Console/composer.json | 65 +++++++++++++++++----------------
 src/Titon/Console/readme.md     | 10 +++++
 3 files changed, 61 insertions(+), 53 deletions(-)
 create mode 100644 src/Titon/Console/readme.md

diff --git a/composer.lock b/composer.lock
index ccaa15d..135139b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "0f0c73f65234ee95c2cbb1feadff9f71",
+    "hash": "0a80bb4245d468af7e25a0508e85ecf3",
     "packages": [
         {
             "name": "psr/http-message",
@@ -416,16 +416,16 @@
         },
         {
             "name": "phpunit/php-text-template",
-            "version": "1.2.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a"
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
-                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
                 "shasum": ""
             },
             "require": {
@@ -434,20 +434,17 @@
             "type": "library",
             "autoload": {
                 "classmap": [
-                    "Text/"
+                    "src/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
             "license": [
                 "BSD-3-Clause"
             ],
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
+                    "email": "sebastian@phpunit.de",
                     "role": "lead"
                 }
             ],
@@ -456,7 +453,7 @@
             "keywords": [
                 "template"
             ],
-            "time": "2014-01-30 17:20:04"
+            "time": "2015-06-21 13:50:34"
         },
         {
             "name": "phpunit/php-timer",
@@ -550,16 +547,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "4.7.4",
+            "version": "4.7.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "e5f851f324f7add846316f39e668e9deac97a103"
+                "reference": "f6701ef3faea759acd1910a7751d8d102a7fd5bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e5f851f324f7add846316f39e668e9deac97a103",
-                "reference": "e5f851f324f7add846316f39e668e9deac97a103",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f6701ef3faea759acd1910a7751d8d102a7fd5bc",
+                "reference": "f6701ef3faea759acd1910a7751d8d102a7fd5bc",
                 "shasum": ""
             },
             "require": {
@@ -618,7 +615,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-06-18 13:33:26"
+            "time": "2015-06-21 07:23:36"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -1013,16 +1010,16 @@
         },
         {
             "name": "sebastian/version",
-            "version": "1.0.5",
+            "version": "1.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "ab931d46cd0d3204a91e1b9a40c4bc13032b58e4"
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/ab931d46cd0d3204a91e1b9a40c4bc13032b58e4",
-                "reference": "ab931d46cd0d3204a91e1b9a40c4bc13032b58e4",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
                 "shasum": ""
             },
             "type": "library",
@@ -1044,7 +1041,7 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2015-02-24 06:35:25"
+            "time": "2015-06-21 13:59:46"
         },
         {
             "name": "symfony/yaml",
diff --git a/src/Titon/Console/composer.json b/src/Titon/Console/composer.json
index cdef2fa..2c8e735 100644
--- a/src/Titon/Console/composer.json
+++ b/src/Titon/Console/composer.json
@@ -1,35 +1,36 @@
 {
-  "name": "titon/console",
-  "type": "library",
-  "description": "",
-  "keywords": ["titon", "console", "cli"],
-  "homepage": "http://titon.io",
-  "license": "BSD-3-Clause",
-  "authors": [
-    {
-      "name": "Miles Johnson",
-      "homepage": "http://milesj.me"
+    "name": "titon/console",
+    "type": "library",
+    "description": "The console packages provides support for command line applications that accept commands, arguments, options, and flags.",
+    "keywords": ["titon", "console", "cli", "command line", "command", "option", "argument", "flag", "shell"],
+    "homepage": "http://titon.io",
+    "license": "BSD-3-Clause",
+    "authors": [
+        {
+            "name": "Miles Johnson",
+            "homepage": "http://milesj.me"
+        },
+        {
+            "name": "Alex Phillips",
+            "homepage": "http://wootables.com"
+        }
+    ],
+    "support": {
+        "irc": "irc://irc.freenode.org/titon",
+        "source": "https://github.com/titon/console"
     },
-    {
-      "name": "Alex Phillips",
-      "homepage": "http://wootables.com"
-    }
-  ],
-  "support": {
-    "irc": "irc://irc.freenode.org/titon",
-    "source": "https://github.com/titon/console"
-  },
-  "require": {
-    "hhvm": ">=3.4.0",
-    "titon/utility": "*",
-    "titon/kernel": "*"
-  },
-  "autoload": {
-    "psr-4": {
-      "Titon\\Console\\": "src/"
+    "require": {
+        "hhvm": ">=3.6.0",
+        "titon/common": "*",
+        "titon/kernel": "*",
+        "titon/utility": "*"
     },
-    "files": [
-      "src/Titon/Console/bootstrap.hh"
-    ]
-  }
-}
\ No newline at end of file
+    "autoload": {
+        "psr-4": {
+            "Titon\\Console\\": ""
+        },
+        "files": [
+            "bootstrap.hh"
+        ]
+    }
+}
diff --git a/src/Titon/Console/readme.md b/src/Titon/Console/readme.md
new file mode 100644
index 0000000..c091bb8
--- /dev/null
+++ b/src/Titon/Console/readme.md
@@ -0,0 +1,10 @@
+# Console #
+[![Project Titon](https://img.shields.io/badge/project-titon-82667d.svg?style=flat)](http://titon.io)
+[![Latest Version](https://img.shields.io/packagist/v/titon/console.svg?style=flat)](https://packagist.org/packages/titon/console)
+[![Total Downloads](https://img.shields.io/packagist/dm/titon/console.svg?style=flat)](https://packagist.org/packages/titon/console)
+[![License](https://img.shields.io/packagist/l/titon/console.svg?style=flat)](https://github.com/titon/framework/blob/master/license.md)
+
+This repository is read-only. Please refer to the official framework repository for any issues, pull requests, or documentation.
+
+* [Framework](https://github.com/titon/framework)
+* [Documentation](https://github.com/titon/framework/blob/master/docs/en/packages/console/index.md)

From 14670d68b19b06fe79179eb0fbb7d5ce1a00e67f Mon Sep 17 00:00:00 2001
From: Miles Johnson <mileswjohnson@gmail.com>
Date: Tue, 23 Jun 2015 22:46:26 -0700
Subject: [PATCH 88/92] Updated to use individual bag classes.

---
 src/Titon/Console/Bag/ArgumentBag.hh         | 20 +++++++++
 src/Titon/Console/Bag/FlagBag.hh             | 20 +++++++++
 src/Titon/Console/Bag/OptionBag.hh           | 20 +++++++++
 src/Titon/Console/Command.hh                 | 19 ++++----
 src/Titon/Console/Command/AbstractCommand.hh | 41 +++++++++--------
 src/Titon/Console/HelpScreen.hh              | 27 ++++++-----
 src/Titon/Console/Input.hh                   | 47 +++++++++++---------
 7 files changed, 133 insertions(+), 61 deletions(-)
 create mode 100644 src/Titon/Console/Bag/ArgumentBag.hh
 create mode 100644 src/Titon/Console/Bag/FlagBag.hh
 create mode 100644 src/Titon/Console/Bag/OptionBag.hh

diff --git a/src/Titon/Console/Bag/ArgumentBag.hh b/src/Titon/Console/Bag/ArgumentBag.hh
new file mode 100644
index 0000000..abf2ebd
--- /dev/null
+++ b/src/Titon/Console/Bag/ArgumentBag.hh
@@ -0,0 +1,20 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\Bag;
+
+use Titon\Console\InputBag;
+use Titon\Console\InputDefinition\Argument;
+
+/**
+ * The `ArgumentBag` holds available `Argument` objects to reference.
+ *
+ * @package Titon\Console\Bag
+ */
+class ArgumentBag extends InputBag<Argument> {
+
+}
diff --git a/src/Titon/Console/Bag/FlagBag.hh b/src/Titon/Console/Bag/FlagBag.hh
new file mode 100644
index 0000000..1481fba
--- /dev/null
+++ b/src/Titon/Console/Bag/FlagBag.hh
@@ -0,0 +1,20 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\Bag;
+
+use Titon\Console\InputBag;
+use Titon\Console\InputDefinition\Flag;
+
+/**
+ * The `FlagBag` holds available `Flag` objects to reference.
+ *
+ * @package Titon\Console\Bag
+ */
+class FlagBag extends InputBag<Flag> {
+
+}
diff --git a/src/Titon/Console/Bag/OptionBag.hh b/src/Titon/Console/Bag/OptionBag.hh
new file mode 100644
index 0000000..870dd1d
--- /dev/null
+++ b/src/Titon/Console/Bag/OptionBag.hh
@@ -0,0 +1,20 @@
+<?hh // strict
+/**
+ * @copyright   2010-2015, The Titon Project
+ * @license     http://opensource.org/licenses/bsd-license.php
+ * @link        http://titon.io
+ */
+
+namespace Titon\Console\Bag;
+
+use Titon\Console\InputBag;
+use Titon\Console\InputDefinition\Option;
+
+/**
+ * The `OptionBag` holds available `Option` objects to reference.
+ *
+ * @package Titon\Console\Bag
+ */
+class OptionBag extends InputBag<Option> {
+
+}
diff --git a/src/Titon/Console/Command.hh b/src/Titon/Console/Command.hh
index f98ec70..4650a90 100644
--- a/src/Titon/Console/Command.hh
+++ b/src/Titon/Console/Command.hh
@@ -7,11 +7,14 @@
 
 namespace Titon\Console;
 
+use Titon\Console\Bag\ArgumentBag;
+use Titon\Console\Bag\FlagBag;
+use Titon\Console\Bag\OptionBag;
 use Titon\Console\Input;
-use Titon\Console\Output;
 use Titon\Console\InputDefinition\Argument;
 use Titon\Console\InputDefinition\Flag;
 use Titon\Console\InputDefinition\Option;
+use Titon\Console\Output;
 
 /**
  * A `Command` is a user-defined class that can to register user input and run
@@ -33,9 +36,9 @@ interface Command {
      * Retrieve all of the `Argument` objects registered specifically for this
      * command.
      *
-     * @return \Titon\Console\InputBag<Argument>
+     * @return \Titon\Console\Bag\ArgumentBag
      */
-    public function getArguments(): InputBag<Argument>;
+    public function getArguments(): ArgumentBag;
 
     /**
      * Retrieve the description of the `Command`.
@@ -47,9 +50,9 @@ interface Command {
     /**
      * Retrieve all of the `Flag` objects registered specifically for this command.
      *
-     * @return \Titon\Console\InputBag<Flag>
+     * @return \Titon\Console\Bag\FlagBag
      */
-    public function getFlags(): InputBag<Flag>;
+    public function getFlags(): FlagBag;
 
     /**
      * Retrieve the name of the `Command`.
@@ -61,9 +64,9 @@ interface Command {
     /**
      * Retrieve all of the `Option` objects registered specifically for this command.
      *
-     * @return \Titon\Console\InputBag<Option>
+     * @return \Titon\Console\Bag\OptionBag
      */
-    public function getOptions(): InputBag<Option>;
+    public function getOptions(): OptionBag;
 
     /**
      * This method prepares the command for execution by registering all of its
@@ -98,4 +101,4 @@ interface Command {
      * @return $this
      */
     public function setOutput(Output $output): this;
-}
\ No newline at end of file
+}
diff --git a/src/Titon/Console/Command/AbstractCommand.hh b/src/Titon/Console/Command/AbstractCommand.hh
index aac6234..6724536 100644
--- a/src/Titon/Console/Command/AbstractCommand.hh
+++ b/src/Titon/Console/Command/AbstractCommand.hh
@@ -7,6 +7,9 @@
 
 namespace Titon\Console\Command;
 
+use Titon\Console\Bag\ArgumentBag;
+use Titon\Console\Bag\FlagBag;
+use Titon\Console\Bag\OptionBag;
 use Titon\Console\Feedback\ProgressBarFeedback;
 use Titon\Console\Feedback\WaitFeedback;
 use Titon\Console\InputBag;
@@ -31,9 +34,9 @@ abstract class AbstractCommand implements Command {
     /**
      * Bag container holding all registered `Argument` objects
      *
-     * @var \Titon\Console\InputBag<Argument>
+     * @var \Titon\Console\Bag\ArgumentBag
      */
-    protected InputBag<Argument> $arguments;
+    protected ArgumentBag $arguments;
 
     /**
      * The description of the command used when rendering its help screen.
@@ -45,9 +48,9 @@ abstract class AbstractCommand implements Command {
     /**
      * Bag container holding all registered `Flag` objects
      *
-     * @var \Titon\Console\InputBag<Flag>
+     * @var \Titon\Console\Bag\FlagBag
      */
-    protected InputBag<Flag> $flags;
+    protected FlagBag $flags;
 
     /**
      * The `Input` object containing all registered and parsed command line
@@ -67,9 +70,9 @@ abstract class AbstractCommand implements Command {
     /**
      * Bag container holding all registered `Option` objects
      *
-     * @var \Titon\Console\InputBag<Option>
+     * @var \Titon\Console\Bag\OptionBag
      */
-    protected InputBag<Option> $options;
+    protected OptionBag $options;
 
     /**
      * The `Output` object to handle output to the user.
@@ -82,9 +85,9 @@ abstract class AbstractCommand implements Command {
      * Construct a new instance of a command.
      */
     public function __construct() {
-        $this->arguments = new InputBag();
-        $this->flags = new InputBag();
-        $this->options = new InputBag();
+        $this->arguments = new ArgumentBag();
+        $this->flags = new FlagBag();
+        $this->options = new OptionBag();
     }
 
     /**
@@ -165,9 +168,9 @@ abstract class AbstractCommand implements Command {
     /**
      * Retrieve all `Argument` objects registered specifically to this command.
      *
-     * @return \Titon\Console\InputBag<Argument>
+     * @return \Titon\Console\Bag\ArgumentBag
      */
-    public function getArguments(): InputBag<Argument> {
+    public function getArguments(): ArgumentBag {
         return $this->arguments;
     }
 
@@ -194,9 +197,9 @@ abstract class AbstractCommand implements Command {
     /**
      * Retrieve all `Flag` objects registered specifically to this command.
      *
-     * @return \Titon\Console\InputBag<Flag>
+     * @return \Titon\Console\Bag\FlagBag
      */
-    public function getFlags(): InputBag<Flag> {
+    public function getFlags(): FlagBag {
         return $this->flags;
     }
 
@@ -223,9 +226,9 @@ abstract class AbstractCommand implements Command {
     /**
      * Retrieve all `Option` objects registered specifically to this command.
      *
-     * @return \Titon\Console\InputBag<Option>
+     * @return \Titon\Console\Bag\OptionBag
      */
-    public function getOptions(): InputBag<Option> {
+    public function getOptions(): OptionBag {
         return $this->options;
     }
 
@@ -287,19 +290,19 @@ abstract class AbstractCommand implements Command {
      * {@inheritdoc}
      */
     public function registerInput(): this {
-        $arguments = (new InputBag())->add($this->arguments->all());
+        $arguments = (new ArgumentBag())->add($this->arguments->all());
         foreach ($this->input->getArguments() as $name => $argument) {
             $arguments[$name] = $argument;
         }
         $this->input->setArguments($arguments);
 
-        $flags = (new InputBag())->add($this->flags->all());
+        $flags = (new FlagBag())->add($this->flags->all());
         foreach ($this->input->getFlags() as $name => $flag) {
             $flags->set($name, $flag);
         }
         $this->input->setFlags($flags);
 
-        $options = (new InputBag())->add($this->options->all());
+        $options = (new OptionBag())->add($this->options->all());
         foreach ($this->input->getOptions() as $name => $option) {
             $options->set($name, $option);
         }
@@ -362,4 +365,4 @@ abstract class AbstractCommand implements Command {
     protected function wait(int $total = 0, string $message = '', int $interval = 100): WaitFeedback {
         return new  WaitFeedback($this->output, $total, $message, $interval);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Titon/Console/HelpScreen.hh b/src/Titon/Console/HelpScreen.hh
index 9177299..19434d7 100644
--- a/src/Titon/Console/HelpScreen.hh
+++ b/src/Titon/Console/HelpScreen.hh
@@ -7,6 +7,9 @@
 
 namespace Titon\Console;
 
+use Titon\Console\Bag\ArgumentBag;
+use Titon\Console\Bag\FlagBag;
+use Titon\Console\Bag\OptionBag;
 use Titon\Console\InputDefinition\Argument;
 use Titon\Console\InputDefinition\Flag;
 use Titon\Console\InputDefinition\Option;
@@ -24,9 +27,9 @@ class HelpScreen {
     /**
      * The available `Argument` objects accepted.
      *
-     * @var \Titon\Console\InputBag<Argument>
+     * @var \Titon\Console\Bag\ArgumentBag
      */
-    protected InputBag<Argument> $arguments;
+    protected ArgumentBag $arguments;
 
     /**
      * The current `Command` the `HelpScreen` refers to.
@@ -52,9 +55,9 @@ class HelpScreen {
     /**
      * The available `Flag` objects accepted.
      *
-     * @var \Titon\Console\InputBag<Flag>
+     * @var \Titon\Console\Bag\FlagBag
      */
-    protected InputBag<Flag> $flags;
+    protected FlagBag $flags;
 
     /**
      * The optional `name` of the application when not outputting a `HelpScreen`
@@ -67,9 +70,9 @@ class HelpScreen {
     /**
      * The available `Option` objects accepted.
      *
-     * @var \Titon\Console\InputBag<Option>
+     * @var \Titon\Console\Bag\OptionBag
      */
-    protected InputBag<Option> $options;
+    protected OptionBag $options;
 
     /**
      * Construct a new instance of the `HelpScreen`.
@@ -327,11 +330,11 @@ class HelpScreen {
     /**
      * Set the `Argument` objects to render information for.
      *
-     * @param \Titon\Console\InputBag<Argument> $arguments The `Argument` objects avaiable
+     * @param \Titon\Console\Bag\ArgumentBag $arguments The `Argument` objects avaiable
      *
      * @return $this
      */
-    public function setArguments(InputBag<Argument> $arguments): this {
+    public function setArguments(ArgumentBag $arguments): this {
         $this->arguments = $arguments;
 
         return $this;
@@ -366,11 +369,11 @@ class HelpScreen {
     /**
      * Set the `Flag` objects to render information for.
      *
-     * @param \Titon\Console\InputBag<Flag> $arguments The `Flag` objects avaiable
+     * @param \Titon\Console\Bag\FlagBag $arguments The `Flag` objects avaiable
      *
      * @return $this
      */
-    public function setFlags(InputBag<Flag> $flags): this {
+    public function setFlags(FlagBag $flags): this {
         $this->flags = $flags;
 
         return $this;
@@ -410,11 +413,11 @@ class HelpScreen {
     /**
      * Set the `Option` objects to render information for.
      *
-     * @param \Titon\Console\InputBag<Option> $arguments The `Option` objects avaiable
+     * @param \Titon\Console\Bag\OptionBag $arguments The `Option` objects avaiable
      *
      * @return $this
      */
-    public function setOptions(InputBag<Option> $options): this {
+    public function setOptions(OptionBag $options): this {
         $this->options = $options;
 
         return $this;
diff --git a/src/Titon/Console/Input.hh b/src/Titon/Console/Input.hh
index f7d55a8..1c2c787 100644
--- a/src/Titon/Console/Input.hh
+++ b/src/Titon/Console/Input.hh
@@ -7,6 +7,9 @@
 
 namespace Titon\Console;
 
+use Titon\Console\Bag\ArgumentBag;
+use Titon\Console\Bag\FlagBag;
+use Titon\Console\Bag\OptionBag;
 use Titon\Utility\State\Server;
 use Titon\Kernel\Input as KernelInput;
 use Titon\Console\InputDefinition\AbstractInputDefinition;
@@ -31,9 +34,9 @@ class Input implements KernelInput {
     /**
      * Bag container holding all registered `Argument` objects
      *
-     * @var \Titon\Console\InputBag<Argument>
+     * @var \Titon\Console\Bag\ArgumentBag
      */
-    protected InputBag<Argument> $arguments;
+    protected ArgumentBag $arguments;
 
     /**
      * The `Command` (if any) that is parsed from the provided input.
@@ -52,9 +55,9 @@ class Input implements KernelInput {
     /**
      * Bag container holding all registered `Flag` objects
      *
-     * @var \Titon\Console\InputBag<Flag>
+     * @var \Titon\Console\Bag\FlagBag
      */
-    protected InputBag<Flag> $flags;
+    protected FlagBag $flags;
 
     /**
      * The `InputLexer` that will traverse and help parse the provided input.
@@ -81,9 +84,9 @@ class Input implements KernelInput {
     /**
      * Bag container holding all registered `Option` objects
      *
-     * @var \Titon\Console\InputBag<Option>
+     * @var \Titon\Console\Bag\OptionBag
      */
-    protected InputBag<Option> $options;
+    protected OptionBag $options;
 
     /**
      * Boolean if the provided input has already been parsed or not.
@@ -126,9 +129,9 @@ class Input implements KernelInput {
 
         $this->rawInput = $args;
         $this->input = new InputLexer($args);
-        $this->flags = new InputBag();
-        $this->options = new InputBag();
-        $this->arguments = new InputBag();
+        $this->flags = new FlagBag();
+        $this->options = new OptionBag();
+        $this->arguments = new ArgumentBag();
         $this->strict = $strict;
         $this->stdin = fopen(Input::STREAM_STDIN, 'r');
     }
@@ -234,9 +237,9 @@ class Input implements KernelInput {
     /**
      * Retrieve all `Argument` candidates.
      *
-     * @return \Titon\Console\InputBag<Argument>
+     * @return \Titon\Console\Bag\ArgumentBag
      */
-    public function getArguments(): InputBag<Argument> {
+    public function getArguments(): ArgumentBag {
         return $this->arguments;
     }
 
@@ -280,9 +283,9 @@ class Input implements KernelInput {
     /**
      * Retrieve all `Flag` candidates.
      *
-     * @return \Titon\Console\InputBag<Flag>
+     * @return \Titon\Console\Bag\FlagBag
      */
-    public function getFlags(): InputBag<Flag> {
+    public function getFlags(): FlagBag {
         return $this->flags;
     }
 
@@ -319,9 +322,9 @@ class Input implements KernelInput {
     /**
      * Retrieve all `Option` candidates.
      *
-     * @return \Titon\Console\InputBag<Option>
+     * @return \Titon\Console\Bag\OptionBag
      */
-    public function getOptions(): InputBag<Option> {
+    public function getOptions(): OptionBag {
         return $this->options;
     }
 
@@ -522,11 +525,11 @@ class Input implements KernelInput {
     /**
      * Set the arguments of the `Input`. This will override all existing arguments.
      *
-     * @param InputBag<Argument> $options The arguments to set
+     * @param \Titon\Console\Bag\ArgumentBag $options The arguments to set
      *
      * @return $this
      */
-    public function setArguments(InputBag<Argument> $arguments): this {
+    public function setArguments(ArgumentBag $arguments): this {
         $this->arguments = $arguments;
 
         return $this;
@@ -535,11 +538,11 @@ class Input implements KernelInput {
     /**
      * Set the flags of the `Input`. This will override all existing flags.
      *
-     * @param InputBag<Flag> $options   The flags to set
+     * @param \Titon\Console\Bag\FlagBag $options   The flags to set
      *
      * @return $this
      */
-    public function setFlags(InputBag<Flag> $flags): this {
+    public function setFlags(FlagBag $flags): this {
         $this->flags = $flags;
 
         return $this;
@@ -564,11 +567,11 @@ class Input implements KernelInput {
     /**
      * Set the options of the `Input`. This will override all existing options.
      *
-     * @param InputBag<Option> $options The options to set
+     * @param \Titon\Console\Bag\OptionBag $options The options to set
      *
      * @return $this
      */
-    public function setOptions(InputBag<Option> $options): this {
+    public function setOptions(OptionBag $options): this {
         $this->options = $options;
 
         return $this;
@@ -586,4 +589,4 @@ class Input implements KernelInput {
 
         return $this;
     }
-}
\ No newline at end of file
+}

From ee4ebc09b6fbabe7cb9e1530d2cc6f08f41e862e Mon Sep 17 00:00:00 2001
From: Miles Johnson <mileswjohnson@gmail.com>
Date: Wed, 24 Jun 2015 23:22:36 -0700
Subject: [PATCH 89/92] Started structuring docs.

---
 docs/en/index.md                              |   3 +-
 docs/en/packages/console/application.md       |  53 +------
 docs/en/packages/console/commands.md          |  56 ++++---
 docs/en/packages/console/index.md             |  17 +-
 docs/en/packages/console/input.md             | 142 +----------------
 docs/en/packages/console/old/application.md   |  54 +++++++
 docs/en/packages/console/old/commands.md      |  37 +++++
 docs/en/packages/console/{ => old}/console.md |   0
 docs/en/packages/console/old/input.md         | 145 ++++++++++++++++++
 docs/en/packages/console/output.md            |   9 ++
 docs/en/packages/index.md                     |   3 +-
 src/Titon/Console/Application.hh              |   2 +-
 src/Titon/Console/Command/AbstractCommand.hh  |   4 +-
 src/Titon/Console/Console.hh                  |   1 +
 .../Console/Feedback/AbstractFeedback.hh      |   6 +-
 .../Console/Feedback/ProgressBarFeedback.hh   |  13 +-
 src/Titon/Console/Feedback/WaitFeedback.hh    |   4 +-
 src/Titon/Console/Input.hh                    |   2 +
 src/Titon/Console/InputBag.hh                 |   5 +-
 src/Titon/Console/Output.hh                   |   8 +-
 src/Titon/Console/System.hh                   |   3 +-
 src/Titon/Console/System/AbstractSystem.hh    |   4 +-
 src/Titon/Console/System/LinuxSystem.hh       |   7 +-
 src/Titon/Console/System/SystemFactory.hh     |   3 +-
 src/Titon/Console/System/WindowsSystem.hh     |   7 +-
 src/Titon/Console/Table/AbstractTable.hh      |   7 +-
 src/Titon/Console/Table/AsciiTable.hh         |  22 +--
 src/Titon/Console/Table/TabDelimitedTable.hh  |  11 +-
 src/Titon/Console/Tree/AbstractTree.hh        |   5 +-
 src/Titon/Console/Tree/AsciiTree.hh           |  13 +-
 src/Titon/Console/Tree/MarkdownTree.hh        |  11 +-
 .../Console/UserInput/AbstractUserInput.hh    |   3 +-
 src/Titon/Console/UserInput/Confirm.hh        |  12 +-
 src/Titon/Console/UserInput/Menu.hh           |   5 +-
 src/Titon/Console/UserInput/Prompt.hh         |  16 +-
 tests/Titon/Test/Stub/Console/CommandStub.hh  |   5 +
 36 files changed, 408 insertions(+), 290 deletions(-)
 create mode 100644 docs/en/packages/console/old/application.md
 create mode 100644 docs/en/packages/console/old/commands.md
 rename docs/en/packages/console/{ => old}/console.md (100%)
 create mode 100644 docs/en/packages/console/old/input.md
 create mode 100644 docs/en/packages/console/output.md

diff --git a/docs/en/index.md b/docs/en/index.md
index a80a350..2b4724d 100644
--- a/docs/en/index.md
+++ b/docs/en/index.md
@@ -7,10 +7,11 @@ Packages
 * [Annotation](packages/annotation/index.md)
 * [Cache](packages/cache/index.md)
 * [Common](packages/common/index.md)
+* [Console](packages/console/index.md)
 * [Context](packages/context/index.md)
 * [Controller](packages/controller/index.md)
 * [Debug](packages/debug/index.md)
-* [Environment](packages/environment/index.md)
+* [Environment](packages/env/index.md)
 * [Event](packages/event/index.md)
 * [HTTP](packages/http/index.md)
 * [Intl](packages/intl/index.md)
diff --git a/docs/en/packages/console/application.md b/docs/en/packages/console/application.md
index 4687026..55a068e 100644
--- a/docs/en/packages/console/application.md
+++ b/docs/en/packages/console/application.md
@@ -1,54 +1,9 @@
 # Application #
 
-See [`Console`](console.md) for more information on scaffolding and building applications.
+## Input & Output ##
 
-The `Console` object functions as the `application` of the console package. Used in conjuction with the `Console`, it provides all necessary scaffolding and setup for building and running CLI applications.
+## Middleware ##
 
-## Construction ##
+## Running & Exiting ##
 
-Creating an application is as simple as constructing a new `Application` object and optionally passing in `Input` and `Output` objects. If no `Input` object is passed in, a new one is constructed using the global arguments provided by the PHP/Hack language.
-
-When used with the `Console`, the `Input` and `Output` objects will be replaced by those passed into the console's `run` method.
-
-```hack
-$app = new Console();
-```
-
-## Commands ##
-
-Once a new application has been created, add commands by calling `addCommand` and passing in a new instance of the command itself. The `Application` object will take care of setting up and configuring the `Command` as necessary.
-
-````hack
-$app->addCommand(new MyCommand());
-```
-
-## Running the Application ##
-
-Once all necessary commands have been added, calling `run` on the `Application` object will execute the application. Again, when used with the `Console` package, this is all handled when the `Console` itself is ran.
-
-```hack
-$app->run();
-```
-
-When executing the application from the command line, the `Application` object will handle the following situations:
-
-* If no command is provided or the `help` flag is present, the help screen of the application will be presented listing all global flags, global options, and available commands.
-* If a command is present and the `help` flag is present, the help screen of the given command will be presented listing all available options, flags, and arguments as well as the usage of the command and its description.
-* If the command is present with valid parameters, the application will execute the `run` command of the `Command`.
-
-## Automatic Setup ##
-
-The `Console` class will automatically bootstrap and set up global parameters and output styles ready for use. The following parameters are readily available:
-
-* --help (-h): The `help` flag to automatically render the help screen of the application or given command.
-* --quiet (-q): Set the verbosity of the application to 0, suppressing all output.
-* --verbose (-v) [stackable]: Set the verbosity level of the application. This is stackable, so each instance of `v` will increase the verbosity level by 1.
-* --ansi: Force ANSI output
-* --no-ansi: Suppress all ANSI output
-
-The following style tags are also readily available for formatting output (see [`StyleDefinition`](style-definition.md) for more information):
-
-* `<info>`: Green text, default background
-* `<warning>`: Yellow text, default background
-* `<error>`: Red text, default background
-* `<exception>`: White text, red background
+## Help Screen ##
diff --git a/docs/en/packages/console/commands.md b/docs/en/packages/console/commands.md
index b26ba5b..a28f4bf 100644
--- a/docs/en/packages/console/commands.md
+++ b/docs/en/packages/console/commands.md
@@ -1,37 +1,43 @@
 # Commands #
 
-A `Command` is a user-created class that handles a specific process with executed by the user from a `Console` application.
+Instantiation and config here.
 
-## Setup ##
+## Defining Parameters ##
 
-A `Command` object is required to have at least 2 methods: `configure` and `run`.
+### Arguments ###
 
-The `configure` method is where the user will specify the name of the command, an optional description, and register any command-specific parameters to be used at runtime.
+### Flags ###
 
-The `run` method is executed by the `Console` after all necessary input is processed.
+### Options ###
 
-```hack
-class HelloWorldCommand {
+## Accepting Input ##
 
-    public function configure() {
-        $this->setName("hello")->setDescription("A simple 'hello world' command!");
-        $this->addArgument(new Argument("name"));
-    }
+### Confirmations ###
 
-    public function run() {
-        if (!is_null($name = $this->getArgument('name'))) {
-            $this->out("Hello, $name!");
-        } else {
-            $this->out("Hello, world!");
-        }
-    }
-}
-```
+confirm()
 
-## Accessing Parameters ##
+### Prompts ###
 
-As shown above, the `getArgument` method inside of the command returns a value as opposed to the `Input` class which returns the `Argument` object. The methods `getFlag`, `getOption`, and `getArgument`, when used inside of the `Command`, will return the value (or default) of the registered parameter. If there is a necessity to access the actual objects, these can be retrieved by calling the same commands on the class's `Input` variable.
+prompt()
 
-```hack
-$nameArgument = $this->input->getArgument('name');
-```
+### Menus ###
+
+menu()
+
+## Sending Output ##
+
+### Messages ###
+
+out(), error()
+
+### Progress Bars ###
+
+progressBar()
+
+### Spinners ###
+
+wait()
+
+### Trees ###
+
+### Tables ###
diff --git a/docs/en/packages/console/index.md b/docs/en/packages/console/index.md
index 1cbeb81..658e94e 100644
--- a/docs/en/packages/console/index.md
+++ b/docs/en/packages/console/index.md
@@ -1,17 +1,22 @@
 # Console Package #
 
-The Console package is almost a type of framework in itself with a collection of tools to aid in the construction of command line applications as well as necessary bootstrapping for handling all input, output, and help information.
-
-### Requirements ###
-
-* [Titon Utility package](../packages/utility/index.md)
+The Console package provides a set of tools that aid in the construction of command line applications, as well as necessary bootstrapping for handling all input and output.
 
 ### Installation ###
 
-This package can be installed with Composer using the core package.
+This package can be installed with Composer.
 
 ```shell
 composer require titon/console:*
 ```
 
 ### Documentation ###
+
+* [Input](input.md)
+* [Output](output.md)
+* [Commands](commands.md)
+* [Application](application.md)
+
+
+* [Type Aliases](types.md)
+
diff --git a/docs/en/packages/console/input.md b/docs/en/packages/console/input.md
index 688fc20..8b3717f 100644
--- a/docs/en/packages/console/input.md
+++ b/docs/en/packages/console/input.md
@@ -1,145 +1,15 @@
 # Input #
 
-All user input is handled by the `Input` class. This is where you define all input that is accepted in the command and/or application itself. The `Input` class also handles parsing of the input to be easily read later.
+## Arguments ##
 
-## Parameters ##
+## Flags ##
 
-Parameters are any input given by the user into the command line application. The supported types of parameters are flags, options, arguments, and commands.
+### Negative ###
 
-#### Description ####
+### Stackable ###
 
-The (optional) description of each parameter can also be set either in its constructor or via a `setter` method. This description is used when rendering the help screen.
+## Options ##
 
-```hack
-$param->setDescription('This is a handy parameter!');
-```
-
-#### Aliases ####
-
-Flags and options also support aliasing. Given the flag `--foo`, an alias assigned to it of `-f` will allow the user to retrieve the flag and assign values using either name.
-
-```hack
-$param = (new Flag('foo'))->alias('f');
-```
-
-#### Mode ####
-
-The `mode` determines if user input is required for the paramter. If no input is given and the mode is set to be required, then an exception will be thrown.
-
-The `mode` is set at construction or through a `setter` method. By default, all parameters are set to optional.
-
-```hack
-$param->setMode(AbstractInputDefinition::MODE_REQUIRED);
-```
-
-### Flags ###
-
-A `Flag` is a boolean flag that is only checked by the parser for its existence. If the flag is present, it is given a value of 1 and a value of 0 is given if it is not.
-
-**NOTE:** Although we say its a `boolean` parameter, that only means the parser does not attempt to give the parameter a value read from the user input. It only checks for the parameter's existence. The `value` assigned to flags are actually numeric to allow for stackable flags.
-
-A flag is added to the `Input` object via the `addFlag` method.
-
-```hack
-$input->addFlag(new Flag('foo'));
-```
-
-Construction of a `Flag` is done by denoting a name for the flag, an optional description, a `mode` (if the flag is required or not), an a boolean value to determine if the flag is stackable.
-
-```hack
-$flag = new Flag('verbose', 'Set the verbosity level of the application', Flag::MODE_OPTIONAL, true);
-```
-
-A registered `Flag` object can be retrieved from the `Input` class by calling the `getFlag` method and passing in either the name or alias of the flag.
-
-```hack
-$myFlag = $input->getFlag('foo'); // Valid
-$myFlag = $input->getFlag('f'); // Also valid
-```
-
-All registered flags can also be retrieved via the `getFlags` method.
-
-#### Stackable Flags #####
-
-If a flag is stackable, then the presence of multiple instances of the flag (consecutively) will increase the value of the flag.
-
-```bash
--vvv // Given a value of 3
-```
-
-If the flag is not stackable, then it is either given a value of 1 (present) and 0 (if not present).
-
-### Options ###
-
-An `Option` is a value-based parameter that is assigned a value based on the input from the command line. The parser handles many different types of notations for reading in options:
-
-```bash
-// Long notation
---foo bar
---foo=bar
---foo="bar"
-
-// Short notation
--f bar
--f=bar
--f="bar"
-```
-
-An option is added to the `Input` object via the `addOption` method.
-
-```hack
-$input->addOption(new Option('foo'));
-```
-
-**NOTE:** If a value containing spaces is to meant to be assigned to an option, it is required to be in quotes.
-
-A registered `Option` object can be retrieved from the `Input` class by calling the `getOption` method and passing in either the name or alias of the option.
-
-```hack
-$myOption = $input->getOption('foo'); // Valid
-$myOption = $input->getOption('f'); // Also valid
-```
-
-All registered options can also be retrieved via the `getOptions` method.
-
-### Arguments ###
-
-Arguments are parameters passed into the application that are not represented by any specific notation. For example, a 'hello world' application may accept a name argument and would be run as:
-
-```hack
-hhvm hello.hh "Alex Phillips"
-```
-
-An argument is added to the `Input` object via the `addArgument` method.
-
-```hack
-$input->addArgument(new Argument('foo'));
-```
-
-A registered `Argument` object can be retrieved from the `Input` class by calling the `getArgument` method and passing in the name of the argument.
-
-```hack
-$nameArgument = $input->getArgument('name');
-```
-
-All registered arguments can also be retrieved via the `getArguments` method.
-
-## [Commands](commands.md) ##
-
-Commands are added to the application through the `addCommand` method in the `Input` class. You can either preemptively parse a command out from the `Input` by calling `getActiveCommand`, or simply call `parse` which will parse out the command along with the rest of the registered parameters.
-
-Once the input has been parsed, `getActiveCommand` will return whatever command has been parsed.
-
-```hack
-$input->addCommand(new MyCommand());
-```
-
-*See [Commands](commands.md) for more information.*
+## Commands ##
 
 ## User Input ##
-
-The `Input` class also manages all user input via STDIN. This functionality is used in the [user input](user-input.md) classes for retrieving information from the user. If this functionality is needed outside of these classes, simply call `getUserInput` to prompt and return the entered value.
-
-```hack
-$usersValue = $input->getUserInput();
-```
diff --git a/docs/en/packages/console/old/application.md b/docs/en/packages/console/old/application.md
new file mode 100644
index 0000000..4687026
--- /dev/null
+++ b/docs/en/packages/console/old/application.md
@@ -0,0 +1,54 @@
+# Application #
+
+See [`Console`](console.md) for more information on scaffolding and building applications.
+
+The `Console` object functions as the `application` of the console package. Used in conjuction with the `Console`, it provides all necessary scaffolding and setup for building and running CLI applications.
+
+## Construction ##
+
+Creating an application is as simple as constructing a new `Application` object and optionally passing in `Input` and `Output` objects. If no `Input` object is passed in, a new one is constructed using the global arguments provided by the PHP/Hack language.
+
+When used with the `Console`, the `Input` and `Output` objects will be replaced by those passed into the console's `run` method.
+
+```hack
+$app = new Console();
+```
+
+## Commands ##
+
+Once a new application has been created, add commands by calling `addCommand` and passing in a new instance of the command itself. The `Application` object will take care of setting up and configuring the `Command` as necessary.
+
+````hack
+$app->addCommand(new MyCommand());
+```
+
+## Running the Application ##
+
+Once all necessary commands have been added, calling `run` on the `Application` object will execute the application. Again, when used with the `Console` package, this is all handled when the `Console` itself is ran.
+
+```hack
+$app->run();
+```
+
+When executing the application from the command line, the `Application` object will handle the following situations:
+
+* If no command is provided or the `help` flag is present, the help screen of the application will be presented listing all global flags, global options, and available commands.
+* If a command is present and the `help` flag is present, the help screen of the given command will be presented listing all available options, flags, and arguments as well as the usage of the command and its description.
+* If the command is present with valid parameters, the application will execute the `run` command of the `Command`.
+
+## Automatic Setup ##
+
+The `Console` class will automatically bootstrap and set up global parameters and output styles ready for use. The following parameters are readily available:
+
+* --help (-h): The `help` flag to automatically render the help screen of the application or given command.
+* --quiet (-q): Set the verbosity of the application to 0, suppressing all output.
+* --verbose (-v) [stackable]: Set the verbosity level of the application. This is stackable, so each instance of `v` will increase the verbosity level by 1.
+* --ansi: Force ANSI output
+* --no-ansi: Suppress all ANSI output
+
+The following style tags are also readily available for formatting output (see [`StyleDefinition`](style-definition.md) for more information):
+
+* `<info>`: Green text, default background
+* `<warning>`: Yellow text, default background
+* `<error>`: Red text, default background
+* `<exception>`: White text, red background
diff --git a/docs/en/packages/console/old/commands.md b/docs/en/packages/console/old/commands.md
new file mode 100644
index 0000000..b26ba5b
--- /dev/null
+++ b/docs/en/packages/console/old/commands.md
@@ -0,0 +1,37 @@
+# Commands #
+
+A `Command` is a user-created class that handles a specific process with executed by the user from a `Console` application.
+
+## Setup ##
+
+A `Command` object is required to have at least 2 methods: `configure` and `run`.
+
+The `configure` method is where the user will specify the name of the command, an optional description, and register any command-specific parameters to be used at runtime.
+
+The `run` method is executed by the `Console` after all necessary input is processed.
+
+```hack
+class HelloWorldCommand {
+
+    public function configure() {
+        $this->setName("hello")->setDescription("A simple 'hello world' command!");
+        $this->addArgument(new Argument("name"));
+    }
+
+    public function run() {
+        if (!is_null($name = $this->getArgument('name'))) {
+            $this->out("Hello, $name!");
+        } else {
+            $this->out("Hello, world!");
+        }
+    }
+}
+```
+
+## Accessing Parameters ##
+
+As shown above, the `getArgument` method inside of the command returns a value as opposed to the `Input` class which returns the `Argument` object. The methods `getFlag`, `getOption`, and `getArgument`, when used inside of the `Command`, will return the value (or default) of the registered parameter. If there is a necessity to access the actual objects, these can be retrieved by calling the same commands on the class's `Input` variable.
+
+```hack
+$nameArgument = $this->input->getArgument('name');
+```
diff --git a/docs/en/packages/console/console.md b/docs/en/packages/console/old/console.md
similarity index 100%
rename from docs/en/packages/console/console.md
rename to docs/en/packages/console/old/console.md
diff --git a/docs/en/packages/console/old/input.md b/docs/en/packages/console/old/input.md
new file mode 100644
index 0000000..688fc20
--- /dev/null
+++ b/docs/en/packages/console/old/input.md
@@ -0,0 +1,145 @@
+# Input #
+
+All user input is handled by the `Input` class. This is where you define all input that is accepted in the command and/or application itself. The `Input` class also handles parsing of the input to be easily read later.
+
+## Parameters ##
+
+Parameters are any input given by the user into the command line application. The supported types of parameters are flags, options, arguments, and commands.
+
+#### Description ####
+
+The (optional) description of each parameter can also be set either in its constructor or via a `setter` method. This description is used when rendering the help screen.
+
+```hack
+$param->setDescription('This is a handy parameter!');
+```
+
+#### Aliases ####
+
+Flags and options also support aliasing. Given the flag `--foo`, an alias assigned to it of `-f` will allow the user to retrieve the flag and assign values using either name.
+
+```hack
+$param = (new Flag('foo'))->alias('f');
+```
+
+#### Mode ####
+
+The `mode` determines if user input is required for the paramter. If no input is given and the mode is set to be required, then an exception will be thrown.
+
+The `mode` is set at construction or through a `setter` method. By default, all parameters are set to optional.
+
+```hack
+$param->setMode(AbstractInputDefinition::MODE_REQUIRED);
+```
+
+### Flags ###
+
+A `Flag` is a boolean flag that is only checked by the parser for its existence. If the flag is present, it is given a value of 1 and a value of 0 is given if it is not.
+
+**NOTE:** Although we say its a `boolean` parameter, that only means the parser does not attempt to give the parameter a value read from the user input. It only checks for the parameter's existence. The `value` assigned to flags are actually numeric to allow for stackable flags.
+
+A flag is added to the `Input` object via the `addFlag` method.
+
+```hack
+$input->addFlag(new Flag('foo'));
+```
+
+Construction of a `Flag` is done by denoting a name for the flag, an optional description, a `mode` (if the flag is required or not), an a boolean value to determine if the flag is stackable.
+
+```hack
+$flag = new Flag('verbose', 'Set the verbosity level of the application', Flag::MODE_OPTIONAL, true);
+```
+
+A registered `Flag` object can be retrieved from the `Input` class by calling the `getFlag` method and passing in either the name or alias of the flag.
+
+```hack
+$myFlag = $input->getFlag('foo'); // Valid
+$myFlag = $input->getFlag('f'); // Also valid
+```
+
+All registered flags can also be retrieved via the `getFlags` method.
+
+#### Stackable Flags #####
+
+If a flag is stackable, then the presence of multiple instances of the flag (consecutively) will increase the value of the flag.
+
+```bash
+-vvv // Given a value of 3
+```
+
+If the flag is not stackable, then it is either given a value of 1 (present) and 0 (if not present).
+
+### Options ###
+
+An `Option` is a value-based parameter that is assigned a value based on the input from the command line. The parser handles many different types of notations for reading in options:
+
+```bash
+// Long notation
+--foo bar
+--foo=bar
+--foo="bar"
+
+// Short notation
+-f bar
+-f=bar
+-f="bar"
+```
+
+An option is added to the `Input` object via the `addOption` method.
+
+```hack
+$input->addOption(new Option('foo'));
+```
+
+**NOTE:** If a value containing spaces is to meant to be assigned to an option, it is required to be in quotes.
+
+A registered `Option` object can be retrieved from the `Input` class by calling the `getOption` method and passing in either the name or alias of the option.
+
+```hack
+$myOption = $input->getOption('foo'); // Valid
+$myOption = $input->getOption('f'); // Also valid
+```
+
+All registered options can also be retrieved via the `getOptions` method.
+
+### Arguments ###
+
+Arguments are parameters passed into the application that are not represented by any specific notation. For example, a 'hello world' application may accept a name argument and would be run as:
+
+```hack
+hhvm hello.hh "Alex Phillips"
+```
+
+An argument is added to the `Input` object via the `addArgument` method.
+
+```hack
+$input->addArgument(new Argument('foo'));
+```
+
+A registered `Argument` object can be retrieved from the `Input` class by calling the `getArgument` method and passing in the name of the argument.
+
+```hack
+$nameArgument = $input->getArgument('name');
+```
+
+All registered arguments can also be retrieved via the `getArguments` method.
+
+## [Commands](commands.md) ##
+
+Commands are added to the application through the `addCommand` method in the `Input` class. You can either preemptively parse a command out from the `Input` by calling `getActiveCommand`, or simply call `parse` which will parse out the command along with the rest of the registered parameters.
+
+Once the input has been parsed, `getActiveCommand` will return whatever command has been parsed.
+
+```hack
+$input->addCommand(new MyCommand());
+```
+
+*See [Commands](commands.md) for more information.*
+
+## User Input ##
+
+The `Input` class also manages all user input via STDIN. This functionality is used in the [user input](user-input.md) classes for retrieving information from the user. If this functionality is needed outside of these classes, simply call `getUserInput` to prompt and return the entered value.
+
+```hack
+$usersValue = $input->getUserInput();
+```
diff --git a/docs/en/packages/console/output.md b/docs/en/packages/console/output.md
new file mode 100644
index 0000000..5444107
--- /dev/null
+++ b/docs/en/packages/console/output.md
@@ -0,0 +1,9 @@
+# Output #
+
+## Verbosity ##
+
+## Colors ##
+
+## Style Definitions ##
+
+## Exceptions ##
diff --git a/docs/en/packages/index.md b/docs/en/packages/index.md
index e54b019..3f0490b 100644
--- a/docs/en/packages/index.md
+++ b/docs/en/packages/index.md
@@ -5,10 +5,11 @@ The Titon Framework aims to be extremely modular by encapsulating similar functi
 * [Annotation](annotation/index.md) - Class and method metadata annotating
 * [Cache](cache/index.md) - Data caching through storage engines
 * [Common](common/index.md) - Common interfaces, traits, and abstract implementations
+* [Console](console/index.md) - Command line applications
 * [Context](context/index.md) - Dependency containers and service providers
 * [Controller](controller/index.md) - Controllers and actions in the dispatch cycle
 * [Debug](debug/index.md) - Debugging, logging, and benchmarking
-* [Environment](environment/index.md) - Environment detection and host bootstrapping
+* [Environment](env/index.md) - Environment detection and host bootstrapping
 * [Event](event/index.md) - Observers, listeners, and event emitting
 * [HTTP](http/index.md) - Request and response handling
 * [Intl](intl/index.md) - Internationalization and localization
diff --git a/src/Titon/Console/Application.hh b/src/Titon/Console/Application.hh
index 82fad5a..b3612dd 100644
--- a/src/Titon/Console/Application.hh
+++ b/src/Titon/Console/Application.hh
@@ -236,12 +236,12 @@ class Application implements KernelApplication {
 
         if ($this->input->getFlag('version')->getValue() === 1) {
             $this->renderVersionInformation();
-
             return;
         }
 
         if ($this->input->getFlag('ansi')->getValue() === 1) {
             $this->output->setForceAnsi(true);
+
         } else if ($this->input->getFlag('no-ansi')->getValue() === 1) {
             $this->output->setSuppressAnsi(true);
         }
diff --git a/src/Titon/Console/Command/AbstractCommand.hh b/src/Titon/Console/Command/AbstractCommand.hh
index 6724536..a87ddf6 100644
--- a/src/Titon/Console/Command/AbstractCommand.hh
+++ b/src/Titon/Console/Command/AbstractCommand.hh
@@ -360,9 +360,9 @@ abstract class AbstractCommand implements Command {
      *
      * @param int    $total     The total number of cycles of the process
      * @param string $message   The message presented with the feedback
-     * @param int    $interval  The time inverval the feedback should update
+     * @param int    $interval  The time interval the feedback should update
      */
     protected function wait(int $total = 0, string $message = '', int $interval = 100): WaitFeedback {
-        return new  WaitFeedback($this->output, $total, $message, $interval);
+        return new WaitFeedback($this->output, $total, $message, $interval);
     }
 }
diff --git a/src/Titon/Console/Console.hh b/src/Titon/Console/Console.hh
index e4d24fb..30672de 100644
--- a/src/Titon/Console/Console.hh
+++ b/src/Titon/Console/Console.hh
@@ -25,4 +25,5 @@ class Console extends AbstractKernel<Application, Input, Output> {
 
         return $output;
     }
+
 }
diff --git a/src/Titon/Console/Feedback/AbstractFeedback.hh b/src/Titon/Console/Feedback/AbstractFeedback.hh
index 0307b4a..705d02e 100644
--- a/src/Titon/Console/Feedback/AbstractFeedback.hh
+++ b/src/Titon/Console/Feedback/AbstractFeedback.hh
@@ -242,7 +242,7 @@ abstract class AbstractFeedback implements Feedback {
             return 1.0;
         }
 
-        return (float)($this->current / $this->total);
+        return (float) ($this->current / $this->total);
     }
 
     /**
@@ -261,6 +261,7 @@ abstract class AbstractFeedback implements Feedback {
 
         $now = microtime(true);
         $span = $now - $this->tick;
+
         if ($span > 1) {
             $this->iteration++;
             $this->tick = $now;
@@ -374,4 +375,5 @@ abstract class AbstractFeedback implements Feedback {
 
         return false;
     }
-}
\ No newline at end of file
+
+}
diff --git a/src/Titon/Console/Feedback/ProgressBarFeedback.hh b/src/Titon/Console/Feedback/ProgressBarFeedback.hh
index 69594c8..3ecc767 100644
--- a/src/Titon/Console/Feedback/ProgressBarFeedback.hh
+++ b/src/Titon/Console/Feedback/ProgressBarFeedback.hh
@@ -38,8 +38,7 @@ class ProgressBarFeedback extends AbstractFeedback {
         $completed = $this->getPercentageComplete();
         $variables = $this->buildOutputVariables();
 
-        // Need to make prefix and suffix before the bar so we know how long
-        // to render it.
+        // Need to make prefix and suffix before the bar so we know how long to render it.
         $prefix = Str::insert($this->prefix, $variables);
         $suffix = Str::insert($this->suffix, $variables);
 
@@ -59,14 +58,11 @@ class ProgressBarFeedback extends AbstractFeedback {
             'suffix'   => $suffix
         };
 
-        if ($this->output->getAnsiAllowed() === false) {
+        if (!$this->output->isAnsiAllowed()) {
             return;
         }
 
-        $eol = Output::CR;
-        if ($finish === true) {
-            $eol = Output::LF;
-        }
+        $eol = ($finish === true) ? Output::LF : Output::CR;
 
         $this->output->out(Str::insert($this->format, $variables, Map {'escape' => false}), Output::VERBOSITY_NORMAL, 1, $eol);
     }
@@ -83,4 +79,5 @@ class ProgressBarFeedback extends AbstractFeedback {
 
         return $this;
     }
-}
\ No newline at end of file
+
+}
diff --git a/src/Titon/Console/Feedback/WaitFeedback.hh b/src/Titon/Console/Feedback/WaitFeedback.hh
index 4a69602..fb311ee 100644
--- a/src/Titon/Console/Feedback/WaitFeedback.hh
+++ b/src/Titon/Console/Feedback/WaitFeedback.hh
@@ -64,7 +64,7 @@ class WaitFeedback extends AbstractFeedback {
             'suffix'   => $suffix
         };
 
-        if ($this->output->getAnsiAllowed() === false) {
+        if (!$this->output->isAnsiAllowed()) {
             return;
         }
 
@@ -82,4 +82,4 @@ class WaitFeedback extends AbstractFeedback {
             $eol
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/Titon/Console/Input.hh b/src/Titon/Console/Input.hh
index 1c2c787..88d45ab 100644
--- a/src/Titon/Console/Input.hh
+++ b/src/Titon/Console/Input.hh
@@ -158,6 +158,7 @@ class Input implements KernelInput {
      */
     public function addCommand(Command $command): this {
         $command->configure();
+
         $this->commands[$command->getName()] = $command;
 
         return $this;
@@ -204,6 +205,7 @@ class Input implements KernelInput {
         }
 
         $input = new Vector($this->rawInput);
+
         foreach ($input as $index => $value) {
             if (!is_null($command = $this->commands->get($value))) {
                 $input->removeKey($index);
diff --git a/src/Titon/Console/InputBag.hh b/src/Titon/Console/InputBag.hh
index 36358e7..1a46696 100644
--- a/src/Titon/Console/InputBag.hh
+++ b/src/Titon/Console/InputBag.hh
@@ -27,7 +27,6 @@ class InputBag<T as InputDefinition> extends AbstractBag<string, T> {
      * @return T|null
      */
     public function get(string $key, ?T $default = null): ?T {
-        $arg = null;
         if (is_null($arg = parent::get($key))) {
             foreach ($this as $val) {
                 if ($key === $val->getAlias()) {
@@ -36,6 +35,6 @@ class InputBag<T as InputDefinition> extends AbstractBag<string, T> {
             }
         }
 
-        return $arg;
+        return $default;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Titon/Console/Output.hh b/src/Titon/Console/Output.hh
index 6addcb2..65fa0e4 100644
--- a/src/Titon/Console/Output.hh
+++ b/src/Titon/Console/Output.hh
@@ -130,7 +130,7 @@ class Output implements KernelOutput {
      *
      * @return $this
      */
-        public function setForceAnsi(bool $force): this {
+    public function setForceAnsi(bool $force): this {
         $this->forceAnsi = $force;
 
         return $this;
@@ -148,7 +148,7 @@ class Output implements KernelOutput {
         $retval = $message;
         foreach ($parsedTags as $xmlTag) {
             if (!is_null($this->styles->get($xmlTag))) {
-                $outputAnsi = $this->getAnsiAllowed();
+                $outputAnsi = $this->isAnsiAllowed();
 
                 $style = $this->styles[$xmlTag];
                 $retval = $style->format($xmlTag, $retval, $outputAnsi);
@@ -167,7 +167,7 @@ class Output implements KernelOutput {
         return $retval;
     }
 
-    public function getAnsiAllowed(): bool {
+    public function isAnsiAllowed(): bool {
         $allowed = false;
         if ($this->forceAnsi === true) {
             $allowed = true;
@@ -314,4 +314,4 @@ class Output implements KernelOutput {
 
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Titon/Console/System.hh b/src/Titon/Console/System.hh
index 91301ca..dbf9dcf 100644
--- a/src/Titon/Console/System.hh
+++ b/src/Titon/Console/System.hh
@@ -41,4 +41,5 @@ interface System {
      * @return bool
      */
     public function supportsAnsi(): bool;
-}
\ No newline at end of file
+
+}
diff --git a/src/Titon/Console/System/AbstractSystem.hh b/src/Titon/Console/System/AbstractSystem.hh
index 2282eb9..057cb3d 100644
--- a/src/Titon/Console/System/AbstractSystem.hh
+++ b/src/Titon/Console/System/AbstractSystem.hh
@@ -56,10 +56,12 @@ abstract class AbstractSystem implements System {
      */
     public function isPiped(): bool {
         $shellPipe = getenv('SHELL_PIPE');
+
         if ($shellPipe !== false) {
             return filter_var($shellPipe, FILTER_VALIDATE_BOOLEAN);
         } else {
             return function_exists('posix_isatty') && !@posix_isatty(STDOUT);
         }
     }
-}
\ No newline at end of file
+
+}
diff --git a/src/Titon/Console/System/LinuxSystem.hh b/src/Titon/Console/System/LinuxSystem.hh
index e4000e2..bb0ca31 100644
--- a/src/Titon/Console/System/LinuxSystem.hh
+++ b/src/Titon/Console/System/LinuxSystem.hh
@@ -18,14 +18,14 @@ class LinuxSystem extends AbstractSystem {
      * {@inheritdoc}
      */
     public function getHeight(): int {
-        return (int)exec('tput lines');
+        return (int) exec('tput lines');
     }
 
     /**
      * {@inheritdoc}
      */
     public function getWidth(): int {
-        return (int)exec('tput cols');
+        return (int) exec('tput cols');
     }
 
     /**
@@ -34,4 +34,5 @@ class LinuxSystem extends AbstractSystem {
     public function supportsAnsi(): bool {
         return (function_exists('posix_isatty') && @posix_isatty(STDOUT));
     }
-}
\ No newline at end of file
+
+}
diff --git a/src/Titon/Console/System/SystemFactory.hh b/src/Titon/Console/System/SystemFactory.hh
index 4118e25..5228c07 100644
--- a/src/Titon/Console/System/SystemFactory.hh
+++ b/src/Titon/Console/System/SystemFactory.hh
@@ -29,4 +29,5 @@ class SystemFactory {
 
         return new LinuxSystem();
     }
-}
\ No newline at end of file
+
+}
diff --git a/src/Titon/Console/System/WindowsSystem.hh b/src/Titon/Console/System/WindowsSystem.hh
index 8be6d2c..21f4e45 100644
--- a/src/Titon/Console/System/WindowsSystem.hh
+++ b/src/Titon/Console/System/WindowsSystem.hh
@@ -27,7 +27,7 @@ class WindowsSystem extends AbstractSystem {
     public function getHeight(): int {
         $this->getStats();
 
-        return (int)$this->modeOutput[0];
+        return (int) $this->modeOutput[0];
     }
 
     /**
@@ -36,7 +36,7 @@ class WindowsSystem extends AbstractSystem {
     public function getWidth(): int {
         $this->getStats();
 
-        return (int)$this->modeOutput[1];
+        return (int) $this->modeOutput[1];
     }
 
     /**
@@ -64,4 +64,5 @@ class WindowsSystem extends AbstractSystem {
     public function supportsAnsi(): bool {
         return (getenv('ANSICON') === true || getenv('ConEmuANSI') === 'ON');
     }
-}
\ No newline at end of file
+
+}
diff --git a/src/Titon/Console/Table/AbstractTable.hh b/src/Titon/Console/Table/AbstractTable.hh
index 0857f11..32bf80c 100644
--- a/src/Titon/Console/Table/AbstractTable.hh
+++ b/src/Titon/Console/Table/AbstractTable.hh
@@ -63,8 +63,8 @@ abstract class AbstractTable implements Table {
     protected function setColumnWidths(Vector<mixed> $row): void {
         foreach ($row as $index => $value) {
             $width = strlen($value);
-
             $currentWidth = 0;
+
             if ($this->columnWidths->containsKey($index)) {
                 $currentWidth = $this->columnWidths[$index];
             }
@@ -85,6 +85,7 @@ abstract class AbstractTable implements Table {
     public function setData(Vector<Map<string, mixed>> $data): this {
         $rows = Vector {};
         $headers = Vector {};
+
         foreach ($data as $row) {
             foreach ($row as $column => $value) {
                 if ($headers->linearSearch($column) < 0) {
@@ -116,10 +117,12 @@ abstract class AbstractTable implements Table {
      */
     public function setRows(Vector<Vector<mixed>> $rows): this {
         $this->rows->clear();
+
         foreach ($rows as $row) {
             $this->addRow($row);
         }
 
         return $this;
     }
-}
\ No newline at end of file
+
+}
diff --git a/src/Titon/Console/Table/AsciiTable.hh b/src/Titon/Console/Table/AsciiTable.hh
index ece388c..115b8c3 100644
--- a/src/Titon/Console/Table/AsciiTable.hh
+++ b/src/Titon/Console/Table/AsciiTable.hh
@@ -64,6 +64,7 @@ class AsciiTable extends AbstractTable {
     protected function buildBorder(): string {
         if (is_null($this->border)) {
             $this->border = '+';
+
             foreach ($this->columnWidths as $width) {
                 $this->border .= $this->characters['padding'];
                 $this->border .= str_repeat('-', $width);
@@ -97,9 +98,11 @@ class AsciiTable extends AbstractTable {
      */
     protected function buildRow(Vector<mixed> $data): string {
         $row = [];
+
         foreach ($data as $index => $value) {
-            $row[] = $this->buildCell((string)$value, $index);
+            $row[] = $this->buildCell((string) $value, $index);
         }
+
         $row = $this->pad(implode($this->characters['border'], $row), $this->characters['border']);
 
         return $row;
@@ -126,21 +129,22 @@ class AsciiTable extends AbstractTable {
      * @return string
      */
     public function render(): string {
-        $retval = Vector {};
+        $output = Vector {};
 
         if ($header = $this->buildRow($this->headers)) {
-            $retval[] = $this->buildBorder();
-            $retval[] = $header;
+            $output[] = $this->buildBorder();
+            $output[] = $header;
         }
 
-        $retval[] = $this->buildBorder();
+        $output[] = $this->buildBorder();
 
         foreach ($this->rows as $row) {
-            $retval[] = $this->buildRow($row);
+            $output[] = $this->buildRow($row);
         }
 
-        $retval[] = $this->buildBorder();
+        $output[] = $this->buildBorder();
 
-        return implode("\n", $retval);
+        return implode("\n", $output);
     }
-}
\ No newline at end of file
+
+}
diff --git a/src/Titon/Console/Table/TabDelimitedTable.hh b/src/Titon/Console/Table/TabDelimitedTable.hh
index 4fc1351..ade9245 100644
--- a/src/Titon/Console/Table/TabDelimitedTable.hh
+++ b/src/Titon/Console/Table/TabDelimitedTable.hh
@@ -21,13 +21,14 @@ class TabDelimitedTable extends AbstractTable {
      * @return string
      */
     public function render(): string {
-        $retval = Vector {};
+        $output = Vector {};
+        $output[] = implode("\t", $this->headers);
 
-        $retval[] = implode("\t", $this->headers);
         foreach ($this->rows as $row) {
-            $retval[] = implode("\t", $row);
+            $output[] = implode("\t", $row);
         }
 
-        return trim(implode("\n", $retval));
+        return trim(implode("\n", $output));
     }
-}
\ No newline at end of file
+
+}
diff --git a/src/Titon/Console/Tree/AbstractTree.hh b/src/Titon/Console/Tree/AbstractTree.hh
index f90a620..ed549b5 100644
--- a/src/Titon/Console/Tree/AbstractTree.hh
+++ b/src/Titon/Console/Tree/AbstractTree.hh
@@ -43,7 +43,7 @@ abstract class AbstractTree implements Tree {
      * @param \Titon\Console\TreeData $tree The tree or branch to build
      * @param string $prefix        The markup prefix for the tree / branch
      *
-     * @retun string
+     * @return string
      */
     abstract protected function build(TreeData $tree, string $prefix = ''): string;
 
@@ -73,4 +73,5 @@ abstract class AbstractTree implements Tree {
 
         return $this;
     }
-}
\ No newline at end of file
+
+}
diff --git a/src/Titon/Console/Tree/AsciiTree.hh b/src/Titon/Console/Tree/AsciiTree.hh
index 257645f..5358cc5 100644
--- a/src/Titon/Console/Tree/AsciiTree.hh
+++ b/src/Titon/Console/Tree/AsciiTree.hh
@@ -24,10 +24,10 @@ class AsciiTree extends AbstractTree {
             $tree = $this->data;
         }
 
-        $retval = [];
-
+        $output = [];
         $keys = array_keys($tree);
         $branch = array_values($tree);
+
         for ($i = 0, $count = count($branch); $i < $count; ++$i) {
             $itemPrefix = $prefix;
             $next = $branch[$i];
@@ -47,16 +47,17 @@ class AsciiTree extends AbstractTree {
             }
 
             if (is_array($branch[$i])) {
-                $retval[] = $itemPrefix . (string)$keys[$i];
+                $output[] = $itemPrefix . (string) $keys[$i];
             } else {
-                $retval[] = $itemPrefix . (string)$branch[$i];
+                $output[] = $itemPrefix . (string) $branch[$i];
             }
 
             if (is_array($next)) {
-                $retval[] = $this->build($next, $prefix . ($i == $count - 1 ? '  ' : '| '));
+                $output[] = $this->build($next, $prefix . ($i == $count - 1 ? '  ' : '| '));
             }
         }
 
-        return implode("\n", $retval);
+        return implode("\n", $output);
     }
+
 }
diff --git a/src/Titon/Console/Tree/MarkdownTree.hh b/src/Titon/Console/Tree/MarkdownTree.hh
index c49a5d6..a7352f0 100644
--- a/src/Titon/Console/Tree/MarkdownTree.hh
+++ b/src/Titon/Console/Tree/MarkdownTree.hh
@@ -24,20 +24,21 @@ class MarkdownTree extends AbstractTree {
             $tree = $this->data;
         }
 
-        $retval = [];
+        $output = [];
 
         foreach ($tree as $label => $branch) {
             if (is_string($branch)) {
                 $label = $branch;
             }
 
-            $retval[] = "$prefix- $label";
+            $output[] = "$prefix- $label";
 
             if (is_array($branch)) {
-                $retval[] = $this->build($branch, "$prefix  ");
+                $output[] = $this->build($branch, "$prefix  ");
             }
         }
 
-        return implode("\n", $retval);
+        return implode("\n", $output);
     }
-}
\ No newline at end of file
+
+}
diff --git a/src/Titon/Console/UserInput/AbstractUserInput.hh b/src/Titon/Console/UserInput/AbstractUserInput.hh
index 734e970..285c5a3 100644
--- a/src/Titon/Console/UserInput/AbstractUserInput.hh
+++ b/src/Titon/Console/UserInput/AbstractUserInput.hh
@@ -100,4 +100,5 @@ abstract class AbstractUserInput<T> implements UserInput {
 
         return $this;
     }
-}
\ No newline at end of file
+
+}
diff --git a/src/Titon/Console/UserInput/Confirm.hh b/src/Titon/Console/UserInput/Confirm.hh
index bd827de..1ccb6d0 100644
--- a/src/Titon/Console/UserInput/Confirm.hh
+++ b/src/Titon/Console/UserInput/Confirm.hh
@@ -10,16 +10,22 @@ namespace Titon\Console\UserInput;
 use Titon\Console\Input;
 use Titon\Console\Output;
 
+/**
+ * @todo
+ */
 class Confirm extends AbstractUserInput<bool> {
 
     /**
-     * The message to be appened to the prompt message containing the accepted
+     * The message to be appended to the prompt message containing the accepted
      * values.
      *
      * @var string
      */
     protected string $message = '';
 
+    /**
+     * @todo
+     */
     public function __construct(Input $input, Output $output) {
         parent::__construct($input, $output);
 
@@ -57,6 +63,7 @@ class Confirm extends AbstractUserInput<bool> {
         do {
             $this->output->out("$message ", Output::VERBOSITY_NORMAL, 0);
             $input = $this->input->getUserInput();
+
             if ($input === '' && $this->default !== '') {
                 $input = $this->default;
             }
@@ -90,4 +97,5 @@ class Confirm extends AbstractUserInput<bool> {
 
         return $this;
     }
-}
\ No newline at end of file
+
+}
diff --git a/src/Titon/Console/UserInput/Menu.hh b/src/Titon/Console/UserInput/Menu.hh
index 242c485..dcd3aa3 100644
--- a/src/Titon/Console/UserInput/Menu.hh
+++ b/src/Titon/Console/UserInput/Menu.hh
@@ -34,6 +34,7 @@ class Menu extends AbstractUserInput<string> {
         if ($this->message !== '') {
             $this->output->out($this->message);
         }
+
         foreach ($values as $index => $item) {
             $this->output->out(sprintf('  %d. %s', $index + 1, (string)$item));
         }
@@ -47,6 +48,7 @@ class Menu extends AbstractUserInput<string> {
             if (is_numeric($input)) {
                 $input = (int)$input;
                 $input--;
+
                 if (!is_null($values[$input])) {
                     return $keys[$input];
                 }
@@ -70,4 +72,5 @@ class Menu extends AbstractUserInput<string> {
 
         return $this;
     }
-}
\ No newline at end of file
+
+}
diff --git a/src/Titon/Console/UserInput/Prompt.hh b/src/Titon/Console/UserInput/Prompt.hh
index 270957b..f346239 100644
--- a/src/Titon/Console/UserInput/Prompt.hh
+++ b/src/Titon/Console/UserInput/Prompt.hh
@@ -31,12 +31,13 @@ class Prompt extends AbstractUserInput<string> {
     public function prompt(string $message): mixed {
         $keys = $this->acceptedValues->keys();
         $values = $this->acceptedValues->values();
+
         if ($this->hint !== '') {
             $message .= " $this->hint";
         }
 
         while (true) {
-            $this->output->out("$message: ", Output::VERBOSITY_NORMAL, 0);
+            $this->output->out($message, Output::VERBOSITY_NORMAL, 0);
             $input = $this->input->getUserInput();
 
             if ($input === '' && $this->default !== '') {
@@ -50,6 +51,7 @@ class Prompt extends AbstractUserInput<string> {
             if (is_numeric($input)) {
                 $input = (int)$input;
                 $input--;
+
                 if (!is_null($values[$input])) {
                     return $keys[$input];
                 }
@@ -83,17 +85,15 @@ class Prompt extends AbstractUserInput<string> {
      */
     public function showHints(bool $showHint = true): this {
         if ($showHint === true) {
-            $retval = Vector {};
-            foreach ($this->acceptedValues as $k => $v) {
-                $retval[] = $v;
-            }
-            $retval = implode('/', $retval);
+            $output = $this->acceptedValues->toVector();
+            $output = implode('/', $output);
 
-            $this->hint = "[$retval]";
+            $this->hint = "[$output]";
         } else {
             $this->hint = '';
         }
 
         return $this;
     }
-}
\ No newline at end of file
+
+}
diff --git a/tests/Titon/Test/Stub/Console/CommandStub.hh b/tests/Titon/Test/Stub/Console/CommandStub.hh
index d67bfd2..52b0cf1 100644
--- a/tests/Titon/Test/Stub/Console/CommandStub.hh
+++ b/tests/Titon/Test/Stub/Console/CommandStub.hh
@@ -39,19 +39,24 @@ class CommandStub extends AbstractCommand {
         if (($type = $this->getOption('tree', '')) !== '') {
             invariant(is_string($type), 'Must be a string.');
             $this->runTreeExample($type);
+
         } else if ($this->getFlag('table') === 1) {
             $this->runTableExample();
+
         } else if ($this->getFlag('greet')) {
             if (($name = $this->getArgument('name', '')) !== '') {
                 $this->out(sprintf('Hello, %s!', $name));
             } else {
                 $this->out('Hello, world!');
             }
+
         } else if (($type = $this->getOption('feedback', '')) !== '') {
             invariant(is_string($type), 'Must be a string.');
             $this->runFeedbackExample($type);
+
         } else if ($this->getFlag('menu')) {
             $this->runUserInputExamples();
+
         } else {
             $this->runUserInputExamples();
         }

From 72ea3c7ca14290debf2992c5fce1349cdeec9293 Mon Sep 17 00:00:00 2001
From: Miles Johnson <mileswjohnson@gmail.com>
Date: Fri, 26 Jun 2015 23:48:23 -0700
Subject: [PATCH 90/92] Added the application docs.

---
 docs/en/packages/console/application.md     | 91 ++++++++++++++++++++-
 docs/en/packages/console/index.md           |  2 +-
 docs/en/packages/console/old/application.md | 22 -----
 docs/en/packages/console/old/console.md     | 15 ----
 src/Titon/Console/Application.hh            |  4 +-
 tests/console.hh                            |  3 +-
 6 files changed, 93 insertions(+), 44 deletions(-)
 delete mode 100644 docs/en/packages/console/old/console.md

diff --git a/docs/en/packages/console/application.md b/docs/en/packages/console/application.md
index 55a068e..32e3b13 100644
--- a/docs/en/packages/console/application.md
+++ b/docs/en/packages/console/application.md
@@ -1,9 +1,94 @@
 # Application #
 
-## Input & Output ##
+There are two distinct parts to a console application, the first being `Titon\Console\Application`, which is the application itself. The application handles the [reading of input](#input-output), [sending of output](#input-output), and the [registering and running of commands](commands.md).
 
-## Middleware ##
+```hack
+$app = new Titon\Console\Application();
+```
+
+An application can be customized with a name, version, and banner, all of which will be displayed when the application is ran. The banner is usually a piece of ASCII art using heredoc.
+
+```hack
+$app->setName('Titon Framework');
+$app->setVersion('1.0.0');
+$app->setBanner($banner);
+```
+
+The second part to a console application is the [kernel](../kernel/index.md), represented with `Titon\Console\Console`. The kernel provides a pipeline for [executing middleware](#middleware) in the context of the command line, as well as running the application mentioned previously. The `Application` must be passed as the 1st argument.
+
+```hack
+$console = new Titon\Console\Console($app);
+```
 
 ## Running & Exiting ##
 
-## Help Screen ##
+Once all necessary [commands](commands.md) have been added, calling `run()` on the `Console` object will execute the application. The `run()` method requires a `Titon\Console\Input` and `Titon\Console\Output` object as arguments for handling user input from the client and formatting output.
+
+```hack
+$console->run(new Titon\Console\Input(), new Titon\Console\Output());
+```
+
+Once the application has ran, a proper exit code needs to be sent -- 0 if successful or 1 otherwise. This can be solved using the `terminate()` method.
+
+```hack
+$console->terminate();
+```
+
+### Execution Flow ###
+
+When executing the application from the command line, the `Application` object will handle the following scenarios:
+
+* If no command is provided or the `--help` flag is present, the help screen of the application will be displayed listing all global flags, global options, and available commands.
+* If a command is present and the `--help` flag is present, the help screen of the given command will be displayed listing all available options, flags, and arguments as well as the usage of the command and its description.
+* If the command is present with valid parameters, the application will execute the `run()` method on the command.
+
+## Parameters ##
+
+There are 4 types of parameters, a command, arguments, flags, and options. A command must be the first parameter passed and only 1 command can be used, however, nested commands are supported. For example, if our script was named "titon.hh", and our command was named "cmd", we can do the following:
+
+```
+hhvm titon.hh cmd
+```
+
+An argument is a value passed to the command -- think method or function arguments. Multiple arguments can be passed and accessed in the order they were defined.
+
+```
+hhvm titon.hh cmd arg1 arg2 arg3
+```
+
+A flag is a boolean value that starts with a double dash (`--`), or a single dash (`-`) for its shorthand variation. The default boolean value can be reversed/negated by prepending `no-` to the flag name.
+
+```
+hhvm titon.hh cmd --flag --no-flag -f
+```
+
+And finally the option, which also starts with a double dash (`--`) and allows arbitrary values to be defined by name. There are 4 variations of options, the first with the value separated by a space, the second using an equals sign, and the last 2 wrapping the value in quotes (when special characters or spaces are used).
+
+```
+hhvm titon.hh cmd --opt1 foo --opt2=bar --opt3 "baz baz" --opt4="qux qux"
+```
+
+### Global Parameters ###
+
+The console application will automatically bootstrap and define the following global parameters.
+
+* `--help` (`-h`) - The help flag will display the help screen of the application or given command.
+* `--quiet` (`-q`) - The quiet flag will set the verbosity of the application to 0, suppressing all output.
+* `--verbose` (`-v`) The verbose flag will set the verbosity level of the application. This flag is stackable, so each instance of `v` will increase the verbosity level by 1.
+* `--ansi` - The ansi flag will force ANSI output.
+* `--no-ansi` - The no-ansi flag will suppress all ANSI output.
+
+## Shebang ##
+
+For easier use on the command line, the application file can include a shebang and drop the file extension. For example, if we have a file simply called "titon" instead of "titon.hh", we could do the following.
+
+```
+#!/usr/bin/env hhvm
+<?hh
+```
+
+And then run it like so:
+
+```
+hhvm titon
+```
diff --git a/docs/en/packages/console/index.md b/docs/en/packages/console/index.md
index 658e94e..bc5bdaa 100644
--- a/docs/en/packages/console/index.md
+++ b/docs/en/packages/console/index.md
@@ -12,10 +12,10 @@ composer require titon/console:*
 
 ### Documentation ###
 
+* [Application](application.md)
 * [Input](input.md)
 * [Output](output.md)
 * [Commands](commands.md)
-* [Application](application.md)
 
 
 * [Type Aliases](types.md)
diff --git a/docs/en/packages/console/old/application.md b/docs/en/packages/console/old/application.md
index 4687026..e186544 100644
--- a/docs/en/packages/console/old/application.md
+++ b/docs/en/packages/console/old/application.md
@@ -22,30 +22,8 @@ Once a new application has been created, add commands by calling `addCommand` an
 $app->addCommand(new MyCommand());
 ```
 
-## Running the Application ##
-
-Once all necessary commands have been added, calling `run` on the `Application` object will execute the application. Again, when used with the `Console` package, this is all handled when the `Console` itself is ran.
-
-```hack
-$app->run();
-```
-
-When executing the application from the command line, the `Application` object will handle the following situations:
-
-* If no command is provided or the `help` flag is present, the help screen of the application will be presented listing all global flags, global options, and available commands.
-* If a command is present and the `help` flag is present, the help screen of the given command will be presented listing all available options, flags, and arguments as well as the usage of the command and its description.
-* If the command is present with valid parameters, the application will execute the `run` command of the `Command`.
-
 ## Automatic Setup ##
 
-The `Console` class will automatically bootstrap and set up global parameters and output styles ready for use. The following parameters are readily available:
-
-* --help (-h): The `help` flag to automatically render the help screen of the application or given command.
-* --quiet (-q): Set the verbosity of the application to 0, suppressing all output.
-* --verbose (-v) [stackable]: Set the verbosity level of the application. This is stackable, so each instance of `v` will increase the verbosity level by 1.
-* --ansi: Force ANSI output
-* --no-ansi: Suppress all ANSI output
-
 The following style tags are also readily available for formatting output (see [`StyleDefinition`](style-definition.md) for more information):
 
 * `<info>`: Green text, default background
diff --git a/docs/en/packages/console/old/console.md b/docs/en/packages/console/old/console.md
deleted file mode 100644
index dd00130..0000000
--- a/docs/en/packages/console/old/console.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Console #
-
-The `Console` handles bootstrapping and running the `Application` object as well as providing all functionality that the [Kernel]() package provides.
-
-## Setup ##
-
-Setup of a new `Console` object (new CLI applications) is very simple. Since `Console` extends `Kernel`, we are required to pass in the `Application` as well as a new pipeline. Once the `Console` is ready to be ran, an `Input` and `Output` object is also required for handling all user input from the terminal and handling formatting output.
-
-The `Pipeline` object handles management of middleware through queue data structures providing 
-
-```hack
-$app = new \Titon\Console\Application();
-$kernel = new Console($app, new \Titon\Kernel\Middleware\Pipeline());
-$kernel->run(new \Titon\Console\Input(), new \Titon\Console\Output());
-$kernel->terminate();
diff --git a/src/Titon/Console/Application.hh b/src/Titon/Console/Application.hh
index b3612dd..7811eab 100644
--- a/src/Titon/Console/Application.hh
+++ b/src/Titon/Console/Application.hh
@@ -7,12 +7,12 @@
 
 namespace Titon\Console;
 
-use Exception;
 use Titon\Console\Input;
 use Titon\Console\Output;
 use Titon\Console\InputDefinition\Flag;
-use ReflectionClass;
 use Titon\Kernel\Application as KernelApplication;
+use Exception;
+use ReflectionClass;
 
 /**
  * The `Application` class bootstraps and handles Input and Output to process and
diff --git a/tests/console.hh b/tests/console.hh
index d5bd1f9..d1b7c7d 100644
--- a/tests/console.hh
+++ b/tests/console.hh
@@ -11,7 +11,8 @@ use Titon\Console\Application;
 use Titon\Console\Console;
 use Titon\Console\Input;
 use Titon\Console\Output;
-use Titon\Kernel\Middleware\Pipeline;use Titon\Test\Stub\Console\CommandStub;
+use Titon\Kernel\Middleware\Pipeline;
+use Titon\Test\Stub\Console\CommandStub;
 
 $banner = <<<'BANNER'
  ______  ______   ______   __    __   ______   __    __   ______   ______   __  __

From 6130bde452e07a2f03260f36eb9006a9f3b53d2f Mon Sep 17 00:00:00 2001
From: Miles Johnson <mileswjohnson@gmail.com>
Date: Sun, 28 Jun 2015 01:49:19 -0700
Subject: [PATCH 91/92] Added output docs.

---
 docs/en/packages/console/application.md     |  4 +-
 docs/en/packages/console/old/application.md |  9 ---
 docs/en/packages/console/output.md          | 77 +++++++++++++++++++++
 src/Titon/Console/Output.hh                 | 68 ++++++++++--------
 4 files changed, 117 insertions(+), 41 deletions(-)

diff --git a/docs/en/packages/console/application.md b/docs/en/packages/console/application.md
index 32e3b13..cd68d0a 100644
--- a/docs/en/packages/console/application.md
+++ b/docs/en/packages/console/application.md
@@ -1,6 +1,6 @@
 # Application #
 
-There are two distinct parts to a console application, the first being `Titon\Console\Application`, which is the application itself. The application handles the [reading of input](#input-output), [sending of output](#input-output), and the [registering and running of commands](commands.md).
+There are two distinct parts to a console application, the first being `Titon\Console\Application`, which is the application itself. The application handles the [reading of input](input.md), [sending of output](output.md), and the [registering and running of commands](commands.md).
 
 ```hack
 $app = new Titon\Console\Application();
@@ -14,7 +14,7 @@ $app->setVersion('1.0.0');
 $app->setBanner($banner);
 ```
 
-The second part to a console application is the [kernel](../kernel/index.md), represented with `Titon\Console\Console`. The kernel provides a pipeline for [executing middleware](#middleware) in the context of the command line, as well as running the application mentioned previously. The `Application` must be passed as the 1st argument.
+The second part to a console application is the [kernel](../kernel/index.md), represented with `Titon\Console\Console`. The kernel provides a pipeline for executing middleware in the context of the command line, as well as running the application mentioned previously. The `Application` must be passed as the 1st argument.
 
 ```hack
 $console = new Titon\Console\Console($app);
diff --git a/docs/en/packages/console/old/application.md b/docs/en/packages/console/old/application.md
index e186544..9bffd08 100644
--- a/docs/en/packages/console/old/application.md
+++ b/docs/en/packages/console/old/application.md
@@ -21,12 +21,3 @@ Once a new application has been created, add commands by calling `addCommand` an
 ````hack
 $app->addCommand(new MyCommand());
 ```
-
-## Automatic Setup ##
-
-The following style tags are also readily available for formatting output (see [`StyleDefinition`](style-definition.md) for more information):
-
-* `<info>`: Green text, default background
-* `<warning>`: Yellow text, default background
-* `<error>`: Red text, default background
-* `<exception>`: White text, red background
diff --git a/docs/en/packages/console/output.md b/docs/en/packages/console/output.md
index 5444107..8b98409 100644
--- a/docs/en/packages/console/output.md
+++ b/docs/en/packages/console/output.md
@@ -1,9 +1,86 @@
 # Output #
 
+Sending output is handled by the `Titon\Console\Output` class. Normal output is sent to stdout through the `php://stdout` stream, while errors are sent to stderr through the `php://stderr` stream.
+
+```hack
+$output = new Titon\Console\Output();
+```
+
+To send a normal message, the `out()` method can be used. This method requires a message string, an optional newline count to append (defaults to 1), and an optional verbosity level.
+
+```hack
+$output->out('This is a normal message', 2); // 2 newlines
+```
+
+Alternatively, the `error()` method can be used to write error messages.
+
+```hack
+$output->error('Oh no, this is an error');
+```
+
 ## Verbosity ##
 
+Every message sent has an assigned verbosity level to it (defaults to 1). The `Output` class has an assigned verbosity level which determines whether to send the output or not. If the message verbosity is equal to or below the `Output` verbosity, the message will be sent.
+
+To set the verbosity level, simply pass an integer to the `Output` constructor (defaults to 1), or use the `setVerbosity()` method.
+
+```hack
+$output->setVerbosity(3);
+```
+
+<div class="notice is-info">
+    The verbosity level is automatically set based on the <code>--verbose</code> and <code>-v</code> flags.
+</div>
+
 ## Colors ##
 
+Colored output requires [ANSI escape codes](https://en.wikipedia.org/wiki/ANSI_escape_code) to be supported in the client terminal. The Console package will automatically detect ANSI support and output accordingly, however, ANSI can be toggled through command line flags or `Output` methods.
+
+The `--ansi` flag or the `setForceAnsi()` method will force ANSI coloring.
+
+```hack
+$output->setForceAnsi(true);
+```
+
+The `--no-ansi` flag or the `setSuppressAnsi()` method will suppress ANSI coloring.
+
+```hack
+$output->setSuppressAnsi(true);
+```
+
 ## Style Definitions ##
 
+Style definitions are a simple way to format messages for coloring using a familiar XML/HTML syntax. When sending a message, simply wrap the portion of the message string to be colored in a specific tag, for example:
+
+```hack
+$output->out('<info>This is an informational message</info>');
+```
+
+The following default style definitions are supported.
+
+* `<info>` - Green text, default background.
+* `<warning>` - Yellow text, default background.
+* `<error>` - Red text, default background.
+* `<exception>` - White text, red background.
+
+### Custom Styles ###
+
+The `setStyle()` method can be used for defining custom styles. This method requires a unique name and a `Titon\Console\StyleDefinition` instance. The `StyleDefinition` requires a foreground color, an optional background color, and a list of optional effects.
+
+```hack
+$output->setStyle('question', new Titon\Console\StyleDefinition('white', 'purple', Vector {}));
+```
+
+The `<question>` tag is now usable when outputting a message.
+
+```hack
+$output->out('<question>Is this correct?</question>');
+```
+
 ## Exceptions ##
+
+When an uncaught exception is thrown from within the console application, the exception message will be output using the `<exception>` tag. To manually output an exception, use the `renderException()` method.
+
+```hack
+$output->renderException($exception);
+```
diff --git a/src/Titon/Console/Output.hh b/src/Titon/Console/Output.hh
index 65fa0e4..53ac16b 100644
--- a/src/Titon/Console/Output.hh
+++ b/src/Titon/Console/Output.hh
@@ -7,9 +7,9 @@
 
 namespace Titon\Console;
 
-use Exception;
 use Titon\Kernel\Output as KernelOutput;
 use Titon\Console\System\SystemFactory;
+use Exception;
 
 /**
  * The `Output` class handles formatting and sending data to the ouput stream.
@@ -21,8 +21,10 @@ class Output implements KernelOutput {
     const int VERBOSITY_QUIET = 0;
     const int VERBOSITY_NORMAL = 1;
     const int VERBOSITY_VERBOSE = 3;
+
     const string STREAM_STDOUT = 'php://stdout';
     const string STREAM_STDERR = 'php://stderr';
+
     const string ANSI_CLEAR_LINE = "\033[K";
     const string LF = PHP_EOL;
     const string CR = "\r";
@@ -108,19 +110,22 @@ class Output implements KernelOutput {
      * Send output to the error stream.
      *
      * @param string $output        The contents to output
-     * @param int    $verbosity     The verbosity level of the output
      * @param int    $newLines      The number of new lines to append to the output
+     * @param int    $verbosity     The verbosity level of the output
      * @param string $newlineChar   The new line character to use
+     * @return $this
      */
-    public function error(string $output = '', int $verbosity = Output::VERBOSITY_NORMAL, int $newLines = 1, string $newlineChar = Output::LF): void {
+    public function error(string $output = '', int $newLines = 1, int $verbosity = Output::VERBOSITY_NORMAL, string $newlineChar = Output::LF): this {
         if (!$this->shouldOutput($verbosity)) {
-            return;
+            return $this;
         }
 
         $output = $this->format($output);
         $output .= str_repeat("\n", $newLines);
 
         fwrite($this->stderr, $output);
+
+        return $this;
     }
 
     /**
@@ -144,36 +149,42 @@ class Output implements KernelOutput {
      * @string
      */
     public function format(string $message): string {
-        $parsedTags = array_unique($this->parseTags($message));
-        $retval = $message;
+        $parsedTags = $this->parseTags($message);
+        $output = $message;
+
         foreach ($parsedTags as $xmlTag) {
             if (!is_null($this->styles->get($xmlTag))) {
                 $outputAnsi = $this->isAnsiAllowed();
-
                 $style = $this->styles[$xmlTag];
-                $retval = $style->format($xmlTag, $retval, $outputAnsi);
+                $output = $style->format($xmlTag, $output, $outputAnsi);
 
                 $matches = [];
-                $retval = preg_replace_callback('#<[\w-]+?>.*<\/[\w-]+?>#', ($matches) ==> {
-                    if ($outputAnsi === true) {
+                $output = preg_replace_callback('#<[\w-]+?>.*<\/[\w-]+?>#', $matches ==> {
+                    if ($outputAnsi) {
                         return sprintf("%s%s%s", $style->getEndCode(), $this->format($matches[0]), $style->getStartCode());
                     }
 
                     return sprintf("%s", $this->format($matches[0]));
-                }, $retval);
+                }, $output);
             }
         }
 
-        return $retval;
+        return $output;
     }
 
+    /**
+     * Detect the current state of ANSI.
+     *
+     * @return bool
+     */
     public function isAnsiAllowed(): bool {
         $allowed = false;
-        if ($this->forceAnsi === true) {
+
+        if ($this->forceAnsi) {
             $allowed = true;
-        } else if ($this->suppressAnsi === true) {
+        } else if ($this->suppressAnsi) {
             $allowed = false;
-        } else if (SystemFactory::factory()->supportsAnsi() === true) {
+        } else if (SystemFactory::factory()->supportsAnsi()) {
             $allowed = true;
         }
 
@@ -197,19 +208,22 @@ class Output implements KernelOutput {
      * Send output to the standard output stream.
      *
      * @param string $output        The contents to output
-     * @param int    $verbosity     The verbosity level of the output
      * @param int    $newLines      The number of new lines to append to the output
+     * @param int    $verbosity     The verbosity level of the output
      * @param string $newlineChar   The new line character to use
+     * @return $this
      */
-    public function out(string $output = '', int $verbosity = Output::VERBOSITY_NORMAL, int $newLines = 1, string $newlineChar = Output::LF): void {
+    public function out(string $output = '', int $newLines = 1, int $verbosity = Output::VERBOSITY_NORMAL, string $newlineChar = Output::LF): this {
         if (!$this->shouldOutput($verbosity)) {
-            return;
+            return $this;
         }
 
         $output = $this->format($output);
         $output .= str_repeat($newlineChar, $newLines);
 
         fwrite($this->stdout, $output);
+
+        return $this;
     }
 
     /**
@@ -217,13 +231,13 @@ class Output implements KernelOutput {
      *
      * @param string $stringToParse The contents to parse
      *
-     * @return array<string>
+     * @return Set<string>
      */
-    protected function parseTags(string $stringToParse): array<string> {
+    protected function parseTags(string $stringToParse): Set<string> {
         $tagsMatched = [];
         preg_match_all('#<([\w-]*?)>#', $stringToParse, $tagsMatched);
 
-        return $tagsMatched[1];
+        return new Set($tagsMatched[1]);
     }
 
     /**
@@ -239,9 +253,7 @@ class Output implements KernelOutput {
         $message = explode('{{BREAK}}', wordwrap($exception->getMessage(), 40, "{{BREAK}}"));
         array_unshift($message, "[$class]");
 
-        $length = max(array_map(($key) ==> {
-            return strlen($key);
-        }, $message));
+        $length = max(array_map($key ==> strlen($key), $message));
 
         $this->error(Output::LF);
         $this->error("<exception>  " . str_pad("", $length) . "  </exception>");
@@ -259,7 +271,6 @@ class Output implements KernelOutput {
      * Currently unused: Send the response through the given output stream.
      */
     public function send(): void {
-
     }
 
     /**
@@ -308,10 +319,7 @@ class Output implements KernelOutput {
      * @return bool
      */
     protected function shouldOutput(int $verbosity): bool {
-        if ($verbosity <= $this->verbosity) {
-            return true;
-        }
-
-        return false;
+        return ($verbosity <= $this->verbosity);
     }
+
 }

From 5584d392e3f1eb404a2c22ded5206a4f516a7d57 Mon Sep 17 00:00:00 2001
From: Miles Johnson <mileswjohnson@gmail.com>
Date: Sun, 28 Jun 2015 12:15:02 -0700
Subject: [PATCH 92/92] Fixed comments.

---
 composer.lock              |  2 +-
 src/Titon/Console/Input.hh | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/composer.lock b/composer.lock
index b43b255..5894349 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "c0f1a81f242cea33502e8809011e436d",
+    "hash": "aefafd0ec2ffe9a5e58f18d8323f3906",
     "packages": [
         {
             "name": "psr/http-message",
diff --git a/src/Titon/Console/Input.hh b/src/Titon/Console/Input.hh
index 88d45ab..1749cb9 100644
--- a/src/Titon/Console/Input.hh
+++ b/src/Titon/Console/Input.hh
@@ -12,7 +12,6 @@ use Titon\Console\Bag\FlagBag;
 use Titon\Console\Bag\OptionBag;
 use Titon\Utility\State\Server;
 use Titon\Kernel\Input as KernelInput;
-use Titon\Console\InputDefinition\AbstractInputDefinition;
 use Titon\Console\InputDefinition\Argument;
 use Titon\Console\InputDefinition\Flag;
 use Titon\Console\InputDefinition\Option;
@@ -139,7 +138,7 @@ class Input implements KernelInput {
     /**
      * Add a new `Argument` candidate to be parsed from input.
      *
-     * @param \Titon\Console\Argument $argument The `Argument` to add
+     * @param \Titon\Console\InputDefinition\Argument $argument The `Argument` to add
      *
      * @return $this
      */
@@ -167,7 +166,7 @@ class Input implements KernelInput {
     /**
      * Add a new `Flag` candidate to be parsed from input.
      *
-     * @param \Titon\Console\Flag $flag The `Flag` to add
+     * @param \Titon\Console\InputDefinition\Flag $flag The `Flag` to add
      *
      * @return $this
      */
@@ -180,7 +179,7 @@ class Input implements KernelInput {
     /**
      * Add a new `Option` candidate to be parsed from input.
      *
-     * @param \Titon\Console\Option $option The `Option` to add
+     * @param \Titon\Console\InputDefinition\Option $option The `Option` to add
      *
      * @return $this
      */
@@ -209,6 +208,7 @@ class Input implements KernelInput {
         foreach ($input as $index => $value) {
             if (!is_null($command = $this->commands->get($value))) {
                 $input->removeKey($index);
+
                 $this->setInput($input);
                 $this->command = $command;
 
@@ -224,7 +224,7 @@ class Input implements KernelInput {
      *
      * @param string $key The key or alias of the `Argument`
      *
-     * @return \Titon\Console\Argument
+     * @return \Titon\Console\InputDefinition\Argument
      */
     public function getArgument(string $key): Argument {
         if (is_null($argument = $this->arguments->get($key))) {
@@ -270,7 +270,7 @@ class Input implements KernelInput {
      *
      * @param string $key The key or alias of the `Flag`
      *
-     * @return \Titon\Console\Flag
+     * @return \Titon\Console\InputDefinition\Flag
      */
     public function getFlag(string $key): Flag {
         if (is_null($flag = $this->flags->get($key))) {
@@ -309,7 +309,7 @@ class Input implements KernelInput {
      *
      * @param string $key The key or alias of the `Option`
      *
-     * @return \Titon\Console\Option
+     * @return \Titon\Console\InputDefinition\Option
      */
     public function getOption(string $key): Option {
         if (is_null($option = $this->options->get($key))) {