Changeset 133

Timestamp:

03/04/08 21:55:39 (10 months ago)

Author:

iteman

Message:

- Added a feature so that one or more directories to be watched for changes can specify by the -w option. (Ticket #13)

Location:

trunk/src/Stagehand

Files:

• TestRunner.php (modified) (8 diffs)
• TestRunner/AlterationMonitor.php (modified) (7 diffs)

trunk/src/Stagehand/TestRunner.php

@@ -143 +143 @@
   -c        color the result of a test runner run
   -p <file> preload <file> as a PHP script
-  -a        watch for changes in a specified directory and run tests in the directory recursively when changes are detected (autotest)
+  -a        watch for changes in one or more directories and run tests in the test directory recursively when changes are detected (autotest)
+  -w <directory1,directory2,...> specify one or more directories to be watched for changes
 
 With no [directory or file], run all tests in the current directory.
@@ -169 +170 @@
 
     /**
-     * Watches for changes in the directory and runs tests in the directory
-     * recursively when changes are detected.
+     * Watches for changes in one or more target directories and runs tests in
+     * the test directory recursively when changes are detected.
      *
      * @param stdClass $config
@@ -177 +178 @@
     private static function _monitorAlteration($config)
     {
-        if (!is_dir($config->directory)) {
-            throw new Stagehand_TestRunner_Exception("ERROR: The specified path [ {$config->directory} ] is not found or not a directory.");
-        }
-
-        $config->directory = realpath($config->directory);
-        if ($config->directory === false) {
-            throw new Stagehand_TestRunner_Exception("ERROR: Cannnot get the absolute path of the specified directory [ {$config->directory} ]. Make sure all elements of the absolute path have valid permissions.");
+        if (!count($config->targetDirectories)) {
+            $directories = (array)$config->directory;
+        } else {
+            $directories = $config->targetDirectories;
+        }
+
+        for ($i = 0, $count = count($directories); $i < $count; ++$i) {
+            if (!is_dir($directories[$i])) {
+                throw new Stagehand_TestRunner_Exception("ERROR: A specified path [ {$directories[$i]} ] is not found or not a directory.");
+            }
+
+            $directories[$i] = realpath($directories[$i]);
+            if ($directories[$i] === false) {
+                throw new Stagehand_TestRunner_Exception("ERROR: Cannnot get the absolute path of a specified directory [ {$directories[$i]} ]. Make sure all elements of the absolute path have valid permissions.");
+            }
         }
 
@@ -223 +232 @@
         $options[] = $config->directory;
 
-        $monitor = new Stagehand_TestRunner_AlterationMonitor($config->directory,
+        $monitor = new Stagehand_TestRunner_AlterationMonitor($directories,
                                                               "$command " . implode(' ', $options)
                                                               );
@@ -242 +251 @@
         $argv = Console_Getopt::readPHPArgv();
         array_shift($argv);
-        $allOptions = Console_Getopt::getopt2($argv, 'hVRcp:a');
+        $allOptions = Console_Getopt::getopt2($argv, 'hVRcp:aw:');
         if (PEAR::isError($allOptions)) {
             throw new Stagehand_TestRunner_Exception('ERROR: ' . preg_replace('/^Console_Getopt: /', '', $allOptions->getMessage()));
@@ -253 +262 @@
         $preload = false;
         $preloadFile = null;
+        $useTargetDirectories = false;
+        $targetDirectories = array();
         foreach ($allOptions as $options) {
             if (!count($options)) {
@@ -282 +293 @@
                         $enableAutotest = true;
                         break;
+                    case 'w':
+                        $useTargetDirectories = true;
+                        $targetDirectories = explode(',', $option[1]);
+                        break;
                     }
                 } else {
@@ -294 +309 @@
                              'enableAutotest' => $enableAutotest,
                              'preload' => $preload,
-                             'preloadFile' => $preloadFile
+                             'preloadFile' => $preloadFile,
+                             'useTargetDirectories' => $useTargetDirectories,
+                             'targetDirectories' => $targetDirectories
                              );
     }

trunk/src/Stagehand/TestRunner/AlterationMonitor.php

@@ -77 +77 @@
      */
 
-    private $_directory;
+    private $_directories;
     private $_command;
     private $_currentElements;
@@ -101 +101 @@
 
     /**
-     * Sets a directory and command string to the properties.
+     * Sets one or more target directories and command string to the properties.
      *
-     * @param string $directory
+     * @param array  $directories
      * @param string $command
      */
-    public function __construct($directory, $command)
-    {
-        $this->_directory = $directory;
+    public function __construct($directories, $command)
+    {
+        $this->_directories = $directories;
         $this->_command = $command;
     }
@@ -116 +116 @@
 
     /**
-     * Watches for changes in the directory and runs tests in the directory
-     * recursively when changes are detected.
+     * Watches for changes in the target directories and runs tests in the test
+     * directory recursively when changes are detected.
      */
     public function monitor()
@@ -124 +124 @@
 
         while (true) {
-            print "
-Waiting for changes in the directory [ {$this->_directory} ] ...
-";
+            print '
+Waiting for changes in the following directories:
+  - ' . implode("\n  - ", $this->_directories) . "\n";
 
             $this->_waitForChanges();
@@ -165 +165 @@
 
     /**
-     * Watches for changes in the directory and returns immediately when
+     * Watches for changes in the target directories and returns immediately when
      * changes are detected.
      */
@@ -180 +180 @@
                 $this->_currentElements = array();
                 $startTime = time();
-                $this->_collectElements($this->_directory);
+                foreach ($this->_directories as $directory) {
+                    $this->_collectElements($directory);
+                }
                 $endTime = time();
                 $elapsedTime = $endTime - $startTime;
@@ -208 +210 @@
 
     /**
-     * Collects all files and directories in the directory and detects any
+     * Collects all files and directories in a target directory and detects any
      * changes of a file or directory immediately.
      *