X-Git-Url: https://git.cweiske.de/shpub.git/blobdiff_plain/4e67ee4a6c7cc62f9c12f091660aae6b1e87d53b..3ce60c4bfacf4774522988b37baa5bffcdafa8b1:/src/shpub/Cli.php?ds=sidebyside diff --git a/src/shpub/Cli.php b/src/shpub/Cli.php index 8ec4acb..a7e658d 100644 --- a/src/shpub/Cli.php +++ b/src/shpub/Cli.php @@ -24,13 +24,17 @@ class Cli $res->command->args['server'], $res->command->args['user'], $res->command->args['key'], - $res->command->options['force'] + $res->command->options['force'], + $res->command->options['scope'] ); break; case 'server': $cmd = new Command_Server($this->cfg); - $cmd->run($res->command->options['verbose']); + $cmd->run( + $res->command->args['server'], + $res->command->options['verbose'] + ); break; default: @@ -41,7 +45,7 @@ class Cli break; } } catch (\Exception $e) { - echo 'Error: ' . $e->getMessage() . "\n"; + Log::err('Error: ' . $e->getMessage()); exit(1); } } @@ -49,7 +53,7 @@ class Cli /** * Let the CLI option parser parse the options. * - * @param object $parser Option parser + * @param object $optParser Option parser * * @return object Parsed command line parameters */ @@ -73,9 +77,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; @@ -92,8 +93,9 @@ class Cli protected function loadOptParser() { $optParser = new \Console_CommandLine(); - $optParser->description = 'shpub'; - $optParser->version = '0.0.2'; + $optParser->name = 'shpub'; + $optParser->description = 'Command line micropub client'; + $optParser->version = '0.5.1'; $optParser->subcommand_required = true; $optParser->addOption( @@ -107,17 +109,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 +120,23 @@ 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_Targets::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; }