From 6e8a5110940591f4f04550ba99537879c4530e39 Mon Sep 17 00:00:00 2001
From: romanb <romanb@625475ce-881a-0410-a577-b389adb331d8>
Date: Tue, 1 Sep 2009 16:33:58 +0000
Subject: [PATCH] [2.0] small visual cli changes

---
 lib/Doctrine/ORM/Tools/Cli.php                           | 8 ++------
 lib/Doctrine/ORM/Tools/Cli/Printers/AnsiColorPrinter.php | 4 +++-
 lib/Doctrine/ORM/Tools/Cli/Tasks/HelpTask.php            | 2 ++
 lib/Doctrine/ORM/Tools/Cli/Tasks/RunSqlTask.php          | 5 ++++-
 lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php      | 5 ++++-
 lib/Doctrine/ORM/Tools/Cli/Tasks/VersionTask.php         | 2 +-
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/lib/Doctrine/ORM/Tools/Cli.php b/lib/Doctrine/ORM/Tools/Cli.php
index 51f1e5465..08b3c38b8 100644
--- a/lib/Doctrine/ORM/Tools/Cli.php
+++ b/lib/Doctrine/ORM/Tools/Cli.php
@@ -60,11 +60,6 @@ use Doctrine\Common\Util\Inflector,
  */
 class Cli
 {
-    /**
-     * @var ORM\Configuration Configuration
-     */
-    //private $_configuration = null;
-    
     /**
      * @var AbstractPrinter CLI Printer instance
      */
@@ -157,7 +152,8 @@ class Cli
         
         try {
             $this->_printer->writeln(
-                'Doctrine Command Line Interface' . PHP_EOL, 'HEADER'
+                'Doctrine Command Line Interface',
+                'HEADER'
             );
         
             // Handle possible multiple tasks on a single command
diff --git a/lib/Doctrine/ORM/Tools/Cli/Printers/AnsiColorPrinter.php b/lib/Doctrine/ORM/Tools/Cli/Printers/AnsiColorPrinter.php
index d4b016aaf..e80371e91 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Printers/AnsiColorPrinter.php
+++ b/lib/Doctrine/ORM/Tools/Cli/Printers/AnsiColorPrinter.php
@@ -43,8 +43,10 @@ class AnsiColorPrinter extends AbstractPrinter
     {
         $this->addStyles(array(
             'ERROR'   => new Style('WHITE', 'RED', array('BOLD' => true)),
+            'WARNING' => new Style('DEFAULT', 'YELLOW'),
+            'KEYWORD' => new Style('BLUE', 'DEFAULT', array('BOLD' => true)),
             'INFO'    => new Style('GREEN', 'DEFAULT', array('BOLD' => true)),
-            'COMMENT' => new Style('DEFAULT', 'YELLOW'),
+            'COMMENT' => new Style('DEFAULT', 'MAGENTA'),
             'HEADER'  => new Style('DEFAULT', 'DEFAULT', array('BOLD' => true)),
             'NONE'    => new Style(),
         ));
diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/HelpTask.php b/lib/Doctrine/ORM/Tools/Cli/Tasks/HelpTask.php
index 4eb0584cd..b25195fff 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Tasks/HelpTask.php
+++ b/lib/Doctrine/ORM/Tools/Cli/Tasks/HelpTask.php
@@ -66,6 +66,8 @@ class HelpTask extends AbstractTask
      */
     public function run()
     {
+        $this->getPrinter()->writeln('Available Tasks:', 'NONE');
+        
         // Switch between ALL available tasks and display the basic Help of each one
         $availableTasks = $this->getAvailableTasks();
         
diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/RunSqlTask.php b/lib/Doctrine/ORM/Tools/Cli/Tasks/RunSqlTask.php
index 0714116c6..0d28e3b09 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Tasks/RunSqlTask.php
+++ b/lib/Doctrine/ORM/Tools/Cli/Tasks/RunSqlTask.php
@@ -24,7 +24,10 @@ class RunSqlTask extends AbstractTask
      */
     public function basicHelp()
     {
-        $this->getPrinter()->writeln('run-sql basic help.', 'INFO');
+        $this->getPrinter()->write('run-sql', 'KEYWORD');
+        $this->getPrinter()->writeln(
+            ' --file=<path> | --sql=<SQL>',
+            'INFO');
     }
     
     /**
diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php b/lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php
index 982e82775..1b5bb5258 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php
+++ b/lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php
@@ -50,7 +50,10 @@ class SchemaToolTask extends AbstractTask
      */
     public function basicHelp()
     {
-        $this->getPrinter()->writeln('create-schema basic help.', 'INFO');
+        $this->getPrinter()->write('schema-tool', 'KEYWORD');
+        $this->getPrinter()->writeln(
+            ' --create | --drop | --update [--dump-sql] [--classdir=<path>]',
+            'INFO');
     }
     
     /**
diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/VersionTask.php b/lib/Doctrine/ORM/Tools/Cli/Tasks/VersionTask.php
index ef48e676e..f016cebf3 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Tasks/VersionTask.php
+++ b/lib/Doctrine/ORM/Tools/Cli/Tasks/VersionTask.php
@@ -52,7 +52,7 @@ class VersionTask extends AbstractTask
      */
     public function basicHelp()
     {
-        $this->getPrinter()->writeln('version extended help.', 'INFO');
+        $this->getPrinter()->writeln('version', 'KEYWORD');
         /*$this->getPrinter()->write('version basic help' . PHP_EOL, 'HEADER');
         $this->getPrinter()->write('version basic help' . PHP_EOL, 'ERROR');
         $this->getPrinter()->write('version basic help' . PHP_EOL, 'INFO');