X-Git-Url: https://git.cweiske.de/shpub.git/blobdiff_plain/c40d4e6c6349b98c90e8bbb79b361e08e60c0dba..f5d5beae735bad2ba8a855c93f55e1c2b11f0244:/src/shpub/Cli.php

diff --git a/src/shpub/Cli.php b/src/shpub/Cli.php
index eedbb10..19f93d7 100644
--- a/src/shpub/Cli.php
+++ b/src/shpub/Cli.php
@@ -89,8 +89,9 @@ class Cli
     protected function loadOptParser()
     {
         $optParser = new \Console_CommandLine();
-        $optParser->description = 'shpub';
-        $optParser->version = '0.0.4';
+        $optParser->name        = 'shpub';
+        $optParser->description = 'Command line micropub client';
+        $optParser->version     = '0.2.1';
         $optParser->subcommand_required = true;
 
         $optParser->addOption(
@@ -115,56 +116,22 @@ class Cli
             )
         );
 
-        $cmd = $optParser->addCommand('connect');
-        $cmd->addOption(
-            'force',
-            array(
-                'short_name'  => '-f',
-                'long_name'   => '--force-update',
-                'description' => 'Force token update if token already available',
-                'action'      => 'StoreTrue',
-                'default'     => false,
-            )
-        );
-        $cmd->addArgument(
-            'server',
-            [
-                'optional'    => false,
-                'description' => 'Server URL',
-            ]
-        );
-        $cmd->addArgument(
-            'user',
-            [
-                'optional'    => true,
-                'description' => 'User URL',
-            ]
-        );
-        $cmd->addArgument(
-            'key',
-            [
-                'optional'    => true,
-                'description' => 'Short name (key)',
-            ]
-        );
-
-        $cmd = $optParser->addCommand('server');
-        $cmd->addOption(
-            'verbose',
-            array(
-                'short_name'  => '-v',
-                'long_name'   => '--verbose',
-                'description' => 'Show more server infos',
-                'action'      => 'StoreTrue',
-                'default'     => false,
-            )
-        );
+        Command_Connect::opts($optParser);
+        Command_Server::opts($optParser);
 
         Command_Article::opts($optParser);
         Command_Note::opts($optParser);
         Command_Reply::opts($optParser);
         Command_Like::opts($optParser);
         Command_Repost::opts($optParser);
+        Command_Rsvp::opts($optParser);
+        Command_Bookmark::opts($optParser);
+
+        Command_Delete::opts($optParser);
+        Command_Undelete::opts($optParser);
+        Command_Update::opts($optParser);
+
+        Command_Upload::opts($optParser);
 
         return $optParser;
     }