introduce CLI update command

diff --git a/src/stapibas/Cli.php b/src/stapibas/Cli.php
index 7ba2b9eef5f350f24c0bdfd73686be2ff3b281e2..07be39f2adce35f74052034baf3d4f8b989fa5db 100644 (file)
--- a/src/stapibas/Cli.php
+++ b/src/stapibas/Cli.php
@@ -29,18 +29,12 @@ class Cli
                 $GLOBALS['dbdsn'], $GLOBALS['dbuser'], $GLOBALS['dbpass']
             );
             $deps->log = $log;
                 $GLOBALS['dbdsn'], $GLOBALS['dbuser'], $GLOBALS['dbpass']
             );
             $deps->log = $log;

-            $deps->options = $result->options;
-
-            $tasks = array_flip(explode(',', $result->options['tasks']));
+            $deps->options = array_merge(
+                $result->options, $result->command->options
+            );

 
 

-            if (isset($tasks['feeds'])) {
-                $this->runUpdateFeeds($deps);
-            }
-            if (isset($tasks['entries'])) {
-                $this->runUpdateEntries($deps);
-            }
-            if (isset($tasks['urls'])) {
-                $this->runPingUrls($deps);
+            if ($result->command_name == 'update') {
+                $this->runUpdate($result, $deps);

             }
         } catch (\Exception $e) {
             $msg = 'stapibas exception!' . "\n"
             }
         } catch (\Exception $e) {
             $msg = 'stapibas exception!' . "\n"


@@ -51,6 +45,21 @@ class Cli
         }
     }
 
         }
     }
 

+    protected function runUpdate($result, $deps)
+    {
+        $tasks = array_flip(explode(',', $result->command->options['tasks']));
+
+        if (isset($tasks['feeds'])) {
+            $this->runUpdateFeeds($deps);
+        }
+        if (isset($tasks['entries'])) {
+            $this->runUpdateEntries($deps);
+        }
+        if (isset($tasks['urls'])) {
+            $this->runUpdatePingUrls($deps);
+        }
+    }
+

     protected function runUpdateFeeds($deps)
     {
         $uf = new Feed_UpdateFeeds($deps);
     protected function runUpdateFeeds($deps)
     {
         $uf = new Feed_UpdateFeeds($deps);


@@ -73,7 +82,7 @@ class Cli
         }
     }
 
         }
     }
 

-    protected function runPingUrls($deps)
+    protected function runUpdatePingUrls($deps)

     {
         $uf = new Feed_PingUrls($deps);
         if ($deps->options['entryurl'] === null) {
     {
         $uf = new Feed_PingUrls($deps);
         if ($deps->options['entryurl'] === null) {


@@ -92,6 +101,33 @@ class Cli
         $p->version = '0.0.1';
 
         $p->addOption(
         $p->version = '0.0.1';
 
         $p->addOption(

+            'debug',
+            array(
+                'short_name'  => '-d',
+                'long_name'   => '--debug',
+                'description' => "Output debug messages",
+                'action'      => 'StoreTrue'
+            )
+        );
+        $p->addOption(
+            'force',
+            array(
+                'short_name'  => '-f',
+                'long_name'   => '--force',
+                'description' => "Update even when resource did not change",
+                'action'      => 'StoreTrue'
+            )
+        );
+
+
+        $update = $p->addCommand(
+            'update',
+            array(
+                'description' => 'Update feed data and send out pings'
+            )
+        );
+
+        $update->addOption(

             'feed',
             array(
                 'short_name'  => '-i',
             'feed',
             array(
                 'short_name'  => '-i',


@@ -102,7 +138,7 @@ class Cli
             )
         );
 
             )
         );
 

-        $p->addOption(
+        $update->addOption(

             'entry',
             array(
                 'short_name'  => '-e',
             'entry',
             array(
                 'short_name'  => '-e',


@@ -113,7 +149,7 @@ class Cli
             )
         );
 
             )
         );
 

-        $p->addOption(
+        $update->addOption(

             'tasks',
             array(
                 'short_name'  => '-t',
             'tasks',
             array(
                 'short_name'  => '-t',


@@ -124,7 +160,7 @@ class Cli
                 'default'     => 'feeds,entries,urls',
             )
         );
                 'default'     => 'feeds,entries,urls',
             )
         );

-        $p->addOption(
+        $update->addOption(

             'list_tasks',
             array(
                 'long_name'   => '--list-tasks',
             'list_tasks',
             array(
                 'long_name'   => '--list-tasks',


@@ -134,7 +170,7 @@ class Cli
             )
         );
 
             )
         );
 

-        $p->addOption(
+        $update->addOption(

             'entryurl',
             array(
                 'short_name'  => '-u',
             'entryurl',
             array(
                 'short_name'  => '-u',


@@ -145,26 +181,6 @@ class Cli
             )
         );
 
             )
         );
 

-
-        $p->addOption(
-            'debug',
-            array(
-                'short_name'  => '-d',
-                'long_name'   => '--debug',
-                'description' => "Output debug messages",
-                'action'      => 'StoreTrue'
-            )
-        );
-        $p->addOption(
-            'force',
-            array(
-                'short_name'  => '-f',
-                'long_name'   => '--force',
-                'description' => "Update even when resource did not change",
-                'action'      => 'StoreTrue'
-            )
-        );
-

         $this->cliParser = $p;
     }
 
         $this->cliParser = $p;
     }