X-Git-Url: https://git.cweiske.de/shpub.git/blobdiff_plain/4e67ee4a6c7cc62f9c12f091660aae6b1e87d53b..e328a9e013a709e77e8e783de98d30d7eccd6d65:/src/shpub/Cli.php

diff --git a/src/shpub/Cli.php b/src/shpub/Cli.php
index 8ec4acb..4507155 100644
--- a/src/shpub/Cli.php
+++ b/src/shpub/Cli.php
@@ -41,7 +41,7 @@ class Cli
                 break;
             }
         } catch (\Exception $e) {
-            echo 'Error: ' . $e->getMessage() . "\n";
+            Log::err('Error: ' . $e->getMessage());
             exit(1);
         }
     }
@@ -73,9 +73,6 @@ class Cli
                     $this->cfg->host = $this->cfg->hosts[$key];
                 }
             }
-            if ($opts['user'] !== null) {
-                $this->cfg->host->user = $opts['user'];
-            }
             $this->cfg->setDebug($opts['debug']);
 
             return $res;
@@ -93,7 +90,7 @@ class Cli
     {
         $optParser = new \Console_CommandLine();
         $optParser->description = 'shpub';
-        $optParser->version = '0.0.2';
+        $optParser->version = '0.1.0';
         $optParser->subcommand_required = true;
 
         $optParser->addOption(
@@ -107,17 +104,6 @@ class Cli
                 'default'     => null,
             )
         );
-        $optParser->addOption(
-            'user',
-            array(
-                'short_name'  => '-u',
-                'long_name'   => '--user',
-                'description' => 'User URL',
-                'help_name'   => 'URL',
-                'action'      => 'StoreString',
-                'default'     => null,
-            )
-        );
         $optParser->addOption(
             'debug',
             array(
@@ -129,54 +115,20 @@ 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);
 
         return $optParser;
     }