updates model cmd

Author: jcheron

src/Ubiquity/devtools/cmd/Command.php

@@ -188,7 +188,7 @@ public static function genModel() {
 	}
 
 	public static function model() {
-		return new Command("model", "modelName", "Generates a new model from scratch.", [
+		return new Command("model", "modelName", "Generates models from scratch.", [
 			'create_model',
 			'create:model',
 			'create-model',
@@ -199,10 +199,12 @@ public static function model() {
 			'newModel'
 		], [
 			'd' => Parameter::create('database', 'The database connection to use', [], 'default'),
-			'o' => Parameter::create('domain', 'The domain in which to create the model.', [], '')
+			'o' => Parameter::create('domain', 'The domain in which to create the model.', [], ''),
+			'k' => Parameter::create('autoincPk', 'The default primary key defined as autoinc.', [], 'id')
 		], [
 			'Ubiquity model User',
-			'Ubiquity model Author -d=projects'
+			'Ubiquity model Author -d=projects',
+			'Ubiquity model Group,User -o=orga'
 		], 'models');
 	}
 

src/Ubiquity/devtools/cmd/Console.php

@@ -40,12 +40,13 @@ public static function question($prompt, array $propositions = null,array $optio
 				return \array_search(\strtolower($rep), \array_map('strtolower', $array))===false;
 			};
 		}
-		echo ConsoleFormatter::colorize($prompt, ConsoleFormatter::BLACK, ConsoleFormatter::BG_YELLOW);
+		echo ConsoleFormatter::colorize(ConsoleFormatter::formatHtml($prompt), ConsoleFormatter::BLACK, ConsoleFormatter::BG_YELLOW);
 		if (\is_array($propositions)) {
 			if (\count($propositions) > 2) {
 				$props = "";
 				foreach ($propositions as $index => $prop) {
-					$props .= "[" . ($index + 1) . "] " . $prop . "\n";
+					$dec=2-\strlen(($index+1).'');
+					$props .= "[" . ($index + 1) . "] " .str_repeat(' ',$dec). $prop . "\n";
 				}
 				echo ConsoleFormatter::formatContent($props);
 				do {
@@ -54,7 +55,7 @@ public static function question($prompt, array $propositions = null,array $optio
 				$answer = $propositions[(int) $answer - 1];
 			} else {
 				echo " (" . implode("/", $propositions) . ")\n";
-				$propositions=array_merge($propositions,$hiddenProposals);
+				$propositions=\array_merge($propositions,$hiddenProposals);
 				do {
 					$answer = self::readline();
 				} while ($continue($answer,$propositions));
@@ -68,7 +69,7 @@ public static function question($prompt, array $propositions = null,array $optio
 		return $answer;
 	}
 
-	public static function yesNoQuestion($prompt, array $propositions = null,array $options=[]){
+	public static function yesNoQuestion($prompt, array $propositions = ['yes','no'],array $options=[]){
 		return self::question($prompt,$propositions,['ignoreCase'=>true,'hiddenProposals'=>['y','n']]);
 	}