Release 0.0.6

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

diff --git a/src/shpub/Cli.php b/src/shpub/Cli.php
index 62f824ee92546455cb309219983b63372d4f3ee1..77b62ccd2be6247ef370fd95c6b8de96118cc495 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;
 
                 $cmd->run($res->command->options['verbose']);
                 break;
 

-            case 'like':
+            default:
+                $class = 'shpub\\Command_' . ucfirst($res->command_name);

                 $this->requireValidHost();
                 $this->requireValidHost();

-                $cmd = new Command_Like($this->cfg);
-                $cmd->run($res->command->args['url']);
+                $cmd = new $class($this->cfg);
+                $cmd->run($res->command);

                 break;
                 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) {
             }
         } catch (\Exception $e) {

-            echo 'Error: ' . $e->getMessage() . "\n";
+            Log::err('Error: ' . $e->getMessage());

             exit(1);
         }
     }
             exit(1);
         }
     }


@@ -79,9 +67,11 @@ class Cli
                 } else {
                     $this->cfg->host = $this->cfg->hosts[$key];
                 }
                 } else {
                     $this->cfg->host = $this->cfg->hosts[$key];
                 }

-            }
-            if ($opts['user'] !== null) {
-                $this->cfg->host->user = $opts['user'];
+            } else {
+                $key = $this->cfg->getDefaultHost();
+                if ($key !== null) {
+                    $this->cfg->host = $this->cfg->hosts[$key];
+                }

             }
             $this->cfg->setDebug($opts['debug']);
 
             }
             $this->cfg->setDebug($opts['debug']);
 


@@ -100,7 +90,7 @@ class Cli
     {
         $optParser = new \Console_CommandLine();
         $optParser->description = 'shpub';
     {
         $optParser = new \Console_CommandLine();
         $optParser->description = 'shpub';

-        $optParser->version = '0.0.0';
+        $optParser->version = '0.0.6';

         $optParser->subcommand_required = true;
 
         $optParser->addOption(
         $optParser->subcommand_required = true;
 
         $optParser->addOption(


@@ -114,17 +104,6 @@ class Cli
                 'default'     => null,
             )
         );
                 '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(
         $optParser->addOption(
             'debug',
             array(


@@ -181,32 +160,16 @@ 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',
-            ]
-        );
+        Command_Article::opts($optParser);
+        Command_Note::opts($optParser);
+        Command_Reply::opts($optParser);
+        Command_Like::opts($optParser);
+        Command_Repost::opts($optParser);
+        Command_Rsvp::opts($optParser);

 
 

-        $cmd = $optParser->addCommand('like');
-        $cmd->addArgument(
-            'url',
-            [
-                'optional'    => false,
-                'description' => 'URL that is liked',
-            ]
-        );
+        Command_Delete::opts($optParser);
+        Command_Undelete::opts($optParser);
+        Command_Update::opts($optParser);

 
         return $optParser;
     }
 
         return $optParser;
     }