Pulling out some duplicated code into methods.

cake/console/console_input_option.php

@@ -53,6 +53,15 @@ class ConsoleInputOption {
 		}
 	}
 
+/**
+ * Get the name of the argument
+ *
+ * @return string
+ */
+	public function name() {
+		return $this->name;
+	}
+
 /**
  * Generate the help for this this option.
  *

cake/console/console_option_parser.php

@@ -390,11 +390,7 @@ class ConsoleOptionParser {
 		}
 		
 		if (!empty($this->_options)) {
-			$max = 0;
+			$max = $this->_getMaxLength($this->_options) + 8;
-			foreach ($this->_options as $description) {
-				$max = (strlen($description->name) > $max) ? strlen($description->name) : $max;
-			}
-			$max += 8;
 			$out[] = '<info>Options:</info>';
 			$out[] = '';
 			foreach ($this->_options as $option) {
@@ -403,11 +399,7 @@ class ConsoleOptionParser {
 			$out[] = '';
 		}
 		if (!empty($this->_args)) {
-			$max = 0;
+			$max = $this->_getMaxLength($this->_args) + 2;
-			foreach ($this->_args as $argument) {
-				$max = (strlen($argument->name) > $max) ? strlen($argument->name) : $max;
-			}
-			$max += 2;
 			$out[] = '<info>Arguments:</info>';
 			$out[] = '';
 			foreach ($this->_args as $argument) {
@@ -547,4 +539,17 @@ class ConsoleOptionParser {
 	protected function _nextToken() {
 		return isset($this->_tokens[0]) ? $this->_tokens[0] : '';
 	}
+
+/**
+ * Iterate over a collection and find the longest named thing.
+ *
+ * @return integer
+ */
+	protected function _getMaxLength($collection) {
+		$max = 0;
+		foreach ($collection as $item) {
+			$max = (strlen($item->name()) > $max) ? strlen($item->name()) : $max;
+		}
+		return $max;
+	}
 }