use default host if none given

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

diff --git a/src/shpub/Cli.php b/src/shpub/Cli.php
index 5b46fcdd1f80748c7ee7dd67c025068390d8112b..44cf8c86744ecaf7b149a1b3039cd3026ed4b69e 100644 (file)
--- a/src/shpub/Cli.php
+++ b/src/shpub/Cli.php
@@ -35,13 +35,13 @@ class Cli
 
             case 'like':
                 $this->requireValidHost();
-                $cmd = new Command_Like($this->cfg->host);
+                $cmd = new Command_Like($this->cfg);
                 $cmd->run($res->command->args['url']);
                 break;
 
             case 'reply':
                 $this->requireValidHost();
-                $cmd = new Command_Reply($this->cfg->host);
+                $cmd = new Command_Reply($this->cfg);
                 $cmd->run(
                     $res->command->args['url'],
                     implode(' ', $res->command->args['text'])
@@ -79,10 +79,16 @@ class Cli
                 } else {
                     $this->cfg->host = $this->cfg->hosts[$key];
                 }
+            } else {
+                $key = $this->cfg->getDefaultHost();
+                if ($key !== null) {
+                    $this->cfg->host = $this->cfg->hosts[$key];
+                }
             }
             if ($opts['user'] !== null) {
                 $this->cfg->host->user = $opts['user'];
             }
+            $this->cfg->setDebug($opts['debug']);
 
             return $res;
         } catch (\Exception $exc) {
@@ -124,6 +130,16 @@ class Cli
                 'default'     => null,
             )
         );
+        $optParser->addOption(
+            'debug',
+            array(
+                'short_name'  => '-d',
+                'long_name'   => '--debug',
+                'description' => 'Verbose output',
+                'action'      => 'StoreTrue',
+                'default'     => false,
+            )
+        );
 
         $cmd = $optParser->addCommand('connect');
         $cmd->addOption(
@@ -146,7 +162,7 @@ class Cli
         $cmd->addArgument(
             'user',
             [
-                'optional'    => false,
+                'optional'    => true,
                 'description' => 'User URL',
             ]
         );