Changeset 365 for trunk

Timestamp:

05/27/10 12:53:10 (11 years ago)

Author:

sander

Message:

Allow updating of single test suite

Location:

trunk/server/www/app

Files:

• models/testsuite.php (modified) (1 diff)
• vendors/shells/suites.php (modified) (3 diffs)

trunk/server/www/app/models/testsuite.php

@@ -30 +30 @@
          * Synchronise all testsuite files to the database
          */
-        public function synchronise()
-        {
-                $suites = $this->find('all');
+        public function synchronise($id = 'all')
+        {
+                if ($id == 'all') {
+                        $suites = $this->find('all');
+                } else {
+                        $suites = $this->find('all', array(
+                                'conditions' => array('Testsuite.id' => $id),
+                        ));
+                }
+
                 foreach ($suites as &$suite) {
                         $this->log(sprintf('Synchronising testsuite "%s"', $suite['Testsuite']['name']), LOG_DEBUG);

trunk/server/www/app/vendors/shells/suites.php

@@ -21 +21 @@
 class SuitesShell extends Shell
 {
+        /** @var array The models to use */
+        public $uses = array('Testsuite');
+
         /**
          * Override startup() so no welcome message is printed
@@ -39 +42 @@
         public function sync()
         {
-                $Testsuite = ClassRegistry::init('Testsuite');
-                $Testsuite->synchronise();
+                $suite_id = $this->_getSuite();
+                $this->Testsuite->synchronise($suite_id);
         }
 
@@ -48 +51 @@
         public function addJobs()
         {
-                $Testsuite = ClassRegistry::init('Testsuite');
-                $Testsuite->addJobs();
+                $this->Testsuite->addJobs();
+        }
+
+        /**
+         * Ask for a test suite
+         */
+        private function _getSuite()
+        {
+                $options = array(1 => 'All test suites');
+                $suites = $this->Testsuite->find('list', array(
+                        'order' => 'Testsuite.name ASC',
+                        'recursive' => -1,
+                ));
+
+                foreach ($suites as $suite) {
+                        $options[] = $suite;
+                }
+
+                $this->out('Please coose a test suite.');
+                $this->hr();
+                foreach ($options as $index => $option) {
+                        $this->out(sprintf('[%d] %s', $index, $option));
+                }
+
+                $suite_id = null;
+                while ($suite_id === null) {
+                        $suiteNum = $this->in('Enter a test suite number, or q to quit', null, 'q');
+
+                        if (strtolower($suiteNum) === 'q') {
+                                $this->out('Exit');
+                                $this->_stop();
+                        }
+
+                        $suiteNum = intval($suiteNum) - 2;
+                        if ($suiteNum >= count($suites)) {
+                                $this->out('Invalid selection');
+                                continue;
+                        }
+
+                        if ($suiteNum == -1) {
+                                $suite_id = false;
+                        } else {
+                                $suite_ids = array_keys($suites);
+                                $suite_id = $suite_ids[$suiteNum];
+                        }
+                }
+
+                return $suite_id;
         }