0
@@ -37,63 +37,17 @@ class PHPSpec_Console_Command
0
      */
0
     public static function main(PHPSpec_Console_Getopt $options = null)
0
     {
0
-        $runnable = array();
0
-        $generateSpecdox = false;
0
         if (is_null($options)) {
0
           $options = new PHPSpec_Console_Getopt;
0
         }
0
-        
0
         if (isset($options->a) || isset($options->autotest)) {
0
           self::autotest($options);
0
           return;
0
         }
0
-        
0
-        // check for straight class to execute
0
-        if (isset($options->specFile)) {
0
-            $loader = new PHPSpec_Runner_Loader_Classname;
0
-            $runnable += $loader->load($options->specFile);
0
-        }
0
-    
0
-        // should only recurse if not running a single spec
0
-        if (isset($options->r) && !isset($options->specFile)) {
0
-            $loader = new PHPSpec_Runner_Loader_DirectoryRecursive;
0
-            $runnable += $loader->load( getcwd() );
0
-        }
0
-
0
-        if (isset($options->s) || (isset($options->format) && $options->format == 'specdoc')) {
0
-            $generateSpecdox = true;
0
-        }
0
-
0
-        if (empty($runnable)) {
0
-            echo 'No specs to execute!';
0
-            return;
0
-        }
0
-
0
-        $result = new PHPSpec_Runner_Result;
0
-        $result->setRuntimeStart(microtime(true));
0
-        
0
-        if (isset($options->reporter)) {
0
-        	$reporterClass = 'PHPSpec_Runner_Reporter_' . ucwords($options->reporter);
0
-        } else {
0
-        	$reporterClass = 'PHPSpec_Runner_Reporter_Console';
0
-        }        
0
-        $reporter = new $reporterClass($result);
0
-        
0
-        $result->setReporter($reporter); 
0
-        
0
-        foreach ($runnable as $behaviourContextReflection) {
0
-            $contextObject = $behaviourContextReflection->newInstance();
0
-            $collection = new PHPSpec_Runner_Collection($contextObject);
0
-            $runner = PHPSpec_Runner_Base::execute($collection, $result);
0
-        }
0
-        
0
-        $result->setRuntimeEnd(microtime(true));
0
-
0
-        $textReporter->output($generateSpecdox);
0
-        
0
-        unset($textReporter, $result, $runner, $runnable, $collection,
0
-            $contextObject, $behaviourContextReflection);
0
-
0
+        if (!isset($options->reporter)) {
0
+        	$options->reporter = 'Console';
0
+        } 
0
+        PHPSpec_Runner::run($options);
0
     }
0
 
0
     /**
0
@@ -126,8 +80,4 @@ class PHPSpec_Console_Command
0
     
0
 }
0
 
0
-if (isset($options) && $options instanceof PHPSpec_Console_Getopt) {
0
-	PHPSpec_Console_Command::main($options);
0
-} else {
0
-	PHPSpec_Console_Command::main();
0
-}
0
\ No newline at end of file
0
+PHPSpec_Console_Command::main();
0
\ No newline at end of file

0
@@ -72,6 +72,15 @@ class PHPSpec_Console_Getopt
0
         return $this->_options;
0
     }
0
 
0
+    public function getAllOptionsAsObject() 
0
+    {
0
+        $options = new stdClass;
0
+        foreach ($this->_options as $key=>$value) {
0
+            $options->$key = $value;
0
+        }
0
+        return $options;
0
+    }
0
+
0
     public static function parseOptionString($str)
0
     {
0
         $argv = explode(' ', $str);

0
@@ -1,6 +1,8 @@
0
 <?php
0
 
0
-class PHPSpec_Runner_Reporter_Html extends PHPSpec_Runner_Reporter{
0
+class PHPSpec_Runner_Reporter_Html extends PHPSpec_Runner_Reporter {
0
+
0
+    protected $_headerSent = false;
0
 
0
   public function output($specs = false)
0
   {
0
@@ -12,13 +14,39 @@ class PHPSpec_Runner_Reporter_Html extends PHPSpec_Runner_Reporter{
0
      * @param string $symbol
0
      */
0
   public function outputStatus($symbol)
0
-	{		
0
+	{
0
+        if (!$this->_headerSent) {
0
+            ob_start();
0
+		    $this->renderHeader();
0
+        }
0
+        switch ($symbol) {
0
+            case '.':
0
+                $symbol = Console_Color::convert("%g$symbol%n");
0
+                break;
0
+            case 'F':
0
+                $symbol = Console_Color::convert("%r$symbol%n");
0
+                break;
0
+            case 'E':
0
+                $symbol = Console_Color::convert("%r$symbol%n");
0
+                break;
0
+            case 'P':
0
+                $symbol = Console_Color::convert("%y$symbol%n");
0
+                break;
0
+            default:
0
+        }
0
+        if (!$this->_headerSent) {
0
+            echo ob_get_clean();
0
+        } else {
0
+            echo $symbol;
0
+        }
0
   }
0
 
0
   public function toString($specs = false)
0
   {
0
-		ob_start();
0
-		$this->renderHeader();
0
+		if (!$this->_headerSent) {
0
+            ob_start();
0
+		    $this->renderHeader();
0
+        }
0
     $this->renderSummary();
0
     if($specs){
0
       $this->renderSpecDocs();
0
@@ -43,8 +71,7 @@ class PHPSpec_Runner_Reporter_Html extends PHPSpec_Runner_Reporter{
0
     return $description . ' ';
0
   }
0
 
0
-	public function getSpecdox(){
0
-			
0
+	public function getSpecdox(){		
0
   }
0
   
0
   private function renderHeader(){
0
@@ -112,7 +139,16 @@ class PHPSpec_Runner_Reporter_Html extends PHPSpec_Runner_Reporter{
0
           margin-top:4px;
0
           font-size:0.8em;
0
             white-space: pre ;
0
-				}				
0
+				}
0
+                span .pass {
0
+                    color: green;
0
+                }
0
+                spec .fail {
0
+                    color: red;
0
+                }
0
+                spec .pending {
0
+                    color: yellow;
0
+                }
0
       </style>      
0
     </head>
0
     <body>