add support for articles (with HTML)

[shpub.git] / src / shpub / Cli.php

diff --git a/src/shpub/Cli.php b/src/shpub/Cli.php
index 44cf8c86744ecaf7b149a1b3039cd3026ed4b69e..eedbb10e37d916f4c68891bec497a4a3f4fddb29 100644 (file)
--- a/src/shpub/Cli.php
+++ b/src/shpub/Cli.php
@@ -33,27 +33,15 @@ class Cli
                 $cmd->run($res->command->options['verbose']);
                 break;
 
-            case 'like':
+            default:
+                $class = 'shpub\\Command_' . ucfirst($res->command_name);
                 $this->requireValidHost();
-                $cmd = new Command_Like($this->cfg);
-                $cmd->run($res->command->args['url']);
+                $cmd = new $class($this->cfg);
+                $cmd->run($res->command);
                 break;
-
-            case 'reply':
-                $this->requireValidHost();
-                $cmd = new Command_Reply($this->cfg);
-                $cmd->run(
-                    $res->command->args['url'],
-                    implode(' ', $res->command->args['text'])
-                );
-                break;
-
-            default:
-                var_dump($this->cfg->host, $res);
-                Log::err('FIXME');
             }
         } catch (\Exception $e) {
-            echo 'Error: ' . $e->getMessage() . "\n";
+            Log::err('Error: ' . $e->getMessage());
             exit(1);
         }
     }
@@ -85,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;
@@ -105,7 +90,7 @@ class Cli
     {
         $optParser = new \Console_CommandLine();
         $optParser->description = 'shpub';
-        $optParser->version = '0.0.0';
+        $optParser->version = '0.0.4';
         $optParser->subcommand_required = true;
 
         $optParser->addOption(
@@ -119,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(
@@ -186,32 +160,11 @@ class Cli
             )
         );
 
-        //$cmd = $optParser->addCommand('post');
-        $cmd = $optParser->addCommand('reply');
-        $cmd->addArgument(
-            'url',
-            [
-                'optional'    => false,
-                'description' => 'URL that is replied to',
-            ]
-        );
-        $cmd->addArgument(
-            'text',
-            [
-                'optional'    => false,
-                'multiple'    => true,
-                'description' => 'Reply text',
-            ]
-        );
-
-        $cmd = $optParser->addCommand('like');
-        $cmd->addArgument(
-            'url',
-            [
-                'optional'    => false,
-                'description' => 'URL that is liked',
-            ]
-        );
+        Command_Article::opts($optParser);
+        Command_Note::opts($optParser);
+        Command_Reply::opts($optParser);
+        Command_Like::opts($optParser);
+        Command_Repost::opts($optParser);
 
         return $optParser;
     }