From 436e42608acfc17290fcb6383a8e1bf0a6f5ba4c Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 28 Oct 2017 15:10:34 +0200 Subject: [PATCH 01/16] Mention console_commandline in dependencies --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index 35dfcca..8a5c087 100644 --- a/README.rst +++ b/README.rst @@ -24,6 +24,7 @@ When using the git version, you need to have the following dependencies installed on your system: - PHP 5.4+ +- PEAR's `Console_CommandLine `_ - PEAR's `HTTP_Request2 `_ - PEAR's `MIME_Type `_ - PEAR's `NET_URL2 `_ -- 2.30.2 From 73b851213bad76c93ec28511b39b37bc12039961 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 28 Oct 2017 15:15:57 +0200 Subject: [PATCH 02/16] Prepare 0.5.2 --- ChangeLog | 5 +++++ build.xml | 2 +- src/shpub/Cli.php | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index abd9b0d..205321c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-10-28 Christian Weiske + + * Fix handling of auth URLs with "?" in them + * Version 0.5.2 + 2017-08-28 Christian Weiske * Fix version output: Show correct version diff --git a/build.xml b/build.xml index 8cb1392..7c8ac5d 100644 --- a/build.xml +++ b/build.xml @@ -1,7 +1,7 @@ - + diff --git a/src/shpub/Cli.php b/src/shpub/Cli.php index a7e658d..04ef974 100644 --- a/src/shpub/Cli.php +++ b/src/shpub/Cli.php @@ -95,7 +95,7 @@ class Cli $optParser = new \Console_CommandLine(); $optParser->name = 'shpub'; $optParser->description = 'Command line micropub client'; - $optParser->version = '0.5.1'; + $optParser->version = '0.5.2'; $optParser->subcommand_required = true; $optParser->addOption( -- 2.30.2 From e46ef107b205a7d38b83f38b71a3bb536274bb75 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Wed, 1 Nov 2017 20:46:33 +0100 Subject: [PATCH 03/16] Add command to create custom types --- README.rst | 17 +++++++++++++++++ src/shpub/Cli.php | 1 + src/shpub/Command/X.php | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+) create mode 100644 src/shpub/Command/X.php diff --git a/README.rst b/README.rst index 8a5c087..410cdcb 100644 --- a/README.rst +++ b/README.rst @@ -115,6 +115,23 @@ URL image upload:: http://known.bogo/2016/img-url +Custom post types +================= +You may create custom post types with the ``x`` command. +This is useful if your micropub endpoint supports additional types, +like known's ``annotation`` type (comments and likes for posts). + +Create a comment to a known post:: + + $ ./bin/shpub.php x annotation\ + -x url=http://known.bogo/2016/example-domain-1\ + -x type=reply\ + -x username=barryf\ + -x userurl=http://example.org/~barryf\ + -x userphoto=http://example.org/~barryf/avatar.jpg\ + -x content="There is a typo in paragraph 1. 'Fou' should be 'Foo'" + + =============== Delete/Undelete =============== diff --git a/src/shpub/Cli.php b/src/shpub/Cli.php index 04ef974..f1a6259 100644 --- a/src/shpub/Cli.php +++ b/src/shpub/Cli.php @@ -131,6 +131,7 @@ class Cli Command_Repost::opts($optParser); Command_Rsvp::opts($optParser); Command_Bookmark::opts($optParser); + Command_X::opts($optParser); Command_Delete::opts($optParser); Command_Undelete::opts($optParser); diff --git a/src/shpub/Command/X.php b/src/shpub/Command/X.php new file mode 100644 index 0000000..644a109 --- /dev/null +++ b/src/shpub/Command/X.php @@ -0,0 +1,41 @@ + + * @license http://www.gnu.org/licenses/agpl.html GNU AGPL v3 + * @link http://cweiske.de/shpub.htm + */ +class Command_X extends Command_AbstractProps +{ + public static function opts(\Console_CommandLine $optParser) + { + $cmd = $optParser->addCommand('x'); + $cmd->description = 'Create a custom type'; + static::addOptHtml($cmd); + static::optsGeneric($cmd); + $cmd->addArgument( + 'type', + [ + 'optional' => false, + 'multiple' => false, + 'description' => 'Microformat object type', + ] + ); + } + + public function run(\Console_CommandLine_Result $cmdRes) + { + $req = new Request($this->cfg->host, $this->cfg); + $req->setType($cmdRes->args['type']); + $this->handleGenericOptions($cmdRes, $req); + + $res = $req->send(); + $postUrl = $res->getHeader('Location'); + Log::info('Object created at server'); + Log::msg($postUrl); + } +} +?> -- 2.30.2 From 85560adaf8334674b1c66baa2edc7f00fa6e1100 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Mon, 13 Nov 2017 07:41:19 +0100 Subject: [PATCH 04/16] document content-from-file --- README.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.rst b/README.rst index 410cdcb..1ac15c9 100644 --- a/README.rst +++ b/README.rst @@ -114,6 +114,12 @@ URL image upload:: Note created at server http://known.bogo/2016/img-url +Load note content from a file:: + + $ ./bin/shpub.php note - < /path/to/file.txt + Note created at server + http://known.bogo/2017/some-note + Custom post types ================= -- 2.30.2 From fa014d88919516a9763a6a9ab0c620ef102f04e4 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Mon, 13 Nov 2017 07:41:32 +0100 Subject: [PATCH 05/16] Prepare 0.6.0 --- ChangeLog | 5 +++++ build.xml | 2 +- src/shpub/Cli.php | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 205321c..1b486da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-11-13 Christian Weiske + + * Add "x" command to post custom types + * Version 0.6.0 + 2017-10-28 Christian Weiske * Fix handling of auth URLs with "?" in them diff --git a/build.xml b/build.xml index 7c8ac5d..d48ad3d 100644 --- a/build.xml +++ b/build.xml @@ -1,7 +1,7 @@ - + diff --git a/src/shpub/Cli.php b/src/shpub/Cli.php index f1a6259..113c149 100644 --- a/src/shpub/Cli.php +++ b/src/shpub/Cli.php @@ -95,7 +95,7 @@ class Cli $optParser = new \Console_CommandLine(); $optParser->name = 'shpub'; $optParser->description = 'Command line micropub client'; - $optParser->version = '0.5.2'; + $optParser->version = '0.6.0'; $optParser->subcommand_required = true; $optParser->addOption( -- 2.30.2 From a460539284aca97046cfd0b46d2c6dd832b43c39 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Wed, 31 Jan 2018 11:17:42 +0100 Subject: [PATCH 06/16] Add --dry-run option for getting curl commands --- src/shpub/Cli.php | 11 +++++++++++ src/shpub/Config.php | 9 ++++++++- src/shpub/Request.php | 10 ++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/shpub/Cli.php b/src/shpub/Cli.php index 113c149..fcc6070 100644 --- a/src/shpub/Cli.php +++ b/src/shpub/Cli.php @@ -78,6 +78,7 @@ class Cli } } $this->cfg->setDebug($opts['debug']); + $this->cfg->setDryRun($opts['dryrun']); return $res; } catch (\Exception $exc) { @@ -119,6 +120,16 @@ class Cli 'default' => false, ) ); + $optParser->addOption( + 'dryrun', + array( + 'short_name' => '-n', + 'long_name' => '--dry-run', + 'description' => 'Do not send modifying HTTP request(s) to the server', + 'action' => 'StoreTrue', + 'default' => false, + ) + ); Command_Connect::opts($optParser); Command_Server::opts($optParser); diff --git a/src/shpub/Config.php b/src/shpub/Config.php index 2ca7d9a..f3ca543 100644 --- a/src/shpub/Config.php +++ b/src/shpub/Config.php @@ -14,6 +14,8 @@ class Config public $debug = false; + public $dryRun = false; + protected function getConfigFilePath() { if (!isset($_SERVER['HOME'])) { @@ -91,7 +93,7 @@ class Config return $key; } } - + reset($this->hosts); return key($this->hosts); } @@ -121,5 +123,10 @@ class Config { $this->debug = $debug; } + + public function setDryRun($dryRun) + { + $this->dryRun = $dryRun; + } } ?> diff --git a/src/shpub/Request.php b/src/shpub/Request.php index dce163f..4437164 100644 --- a/src/shpub/Request.php +++ b/src/shpub/Request.php @@ -93,6 +93,16 @@ class Request $cp = new CurlPrinter(); $cp->show($this->req, $this->uploadsInfo, $this->dedicatedBody); } + + if ($this->cfg->dryRun && $this->req->getMethod() != 'GET') { + //do not run any modifying queries + //fake a successful response + $res = new \HTTP_Request2_Response('HTTP/1.1 200 OK', false); + $res->parseHeaderLine('Content-type: text/plain'); + $res->appendBody('Fake --dry-run response'); + return $res; + } + $res = $this->req->send(); if (intval($res->getStatus() / 100) != 2) { -- 2.30.2 From 0a7989a9eb92e3cc3ea06dee5964f91b677ac920 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 1 Feb 2018 11:12:23 +0100 Subject: [PATCH 07/16] Add location header to --dry-run fake response --- src/shpub/Request.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/shpub/Request.php b/src/shpub/Request.php index 4437164..e7c3b77 100644 --- a/src/shpub/Request.php +++ b/src/shpub/Request.php @@ -99,6 +99,7 @@ class Request //fake a successful response $res = new \HTTP_Request2_Response('HTTP/1.1 200 OK', false); $res->parseHeaderLine('Content-type: text/plain'); + $res->parseHeaderLine('Location: http://example.org/fake-response'); $res->appendBody('Fake --dry-run response'); return $res; } -- 2.30.2 From afec87fc377ef8bafec4b7588084cca91468bd68 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 1 Feb 2018 11:12:31 +0100 Subject: [PATCH 08/16] Handle space after "-x" option. Normally you do "-xfoo=bar", but some people try to do "-x foo=bar" which caused strange issues. Resolves: https://github.com/cweiske/shpub/issues/11 --- src/shpub/Command/AbstractProps.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/shpub/Command/AbstractProps.php b/src/shpub/Command/AbstractProps.php index e186819..c893eef 100644 --- a/src/shpub/Command/AbstractProps.php +++ b/src/shpub/Command/AbstractProps.php @@ -188,6 +188,10 @@ class Command_AbstractProps if (count($cmdRes->options['x'])) { $postParams = []; foreach ($cmdRes->options['x'] as $xproperty) { + if ($xproperty == '') { + //happens with "-x foo=bar" instead of "-xfoo=bar" + continue; + } list($propkey, $propval) = explode('=', $xproperty, 2); if (!isset($postParams[$propkey])) { $postParams[$propkey] = []; -- 2.30.2 From a732e29e9c1c48c35301887ab95d391d092b1c2f Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 1 Feb 2018 11:50:49 +0100 Subject: [PATCH 09/16] Fix CS --- src/shpub/Cli.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/shpub/Cli.php b/src/shpub/Cli.php index fcc6070..080bfe8 100644 --- a/src/shpub/Cli.php +++ b/src/shpub/Cli.php @@ -125,7 +125,8 @@ class Cli array( 'short_name' => '-n', 'long_name' => '--dry-run', - 'description' => 'Do not send modifying HTTP request(s) to the server', + 'description' => 'Do not send modifying HTTP request(s)' + . ' to the server', 'action' => 'StoreTrue', 'default' => false, ) -- 2.30.2 From 613d09d06d7bab3c6d91fd1b5b231e54c7304480 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Mon, 5 Feb 2018 07:47:19 +0100 Subject: [PATCH 10/16] Talk about installation and --dry-run --- README.rst | 82 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 59 insertions(+), 23 deletions(-) diff --git a/README.rst b/README.rst index 1ac15c9..ef807ac 100644 --- a/README.rst +++ b/README.rst @@ -18,6 +18,26 @@ See `shpub downloads page `_ for all released versions. +Installation +============ +After downloading ``shpub-x.y.z.phar``, you can either use it directly:: + + $ php /path/to/shpub-x.y.z.phar --version + +or make it more easily accessible:: + + $ mv /path/to/shpub-x.y.z.phar /usr/local/bin/shpub + $ chmod +x /usr/local/bin/shpub + $ shpub --version + +You might need ``sudo`` to be able to copy it into the ``/usr/local/bin/`` +directory. + +If you're running from the git checkout, start it as follows:: + + $ ./bin/shpub.php --version + + Dependencies ============ When using the git version, you need to have the following dependencies @@ -35,13 +55,13 @@ Initial setup ============= :: - $ ./bin/shpub.php connect http://mywebsite + $ shpub connect http://mywebsite -Different user:: +In case there are multiple users on the same server:: - $ ./bin/shpub.php connect http://mywebsite http://mywebsite/user + $ shpub connect http://sharedwebsite http://shareswebsite/user -If you pass a third parameter, then it will be the name of the connection. +If you pass a third parameter, then that will be the name of the connection. You can select a specific server/connection with ``-s`` on all commands. @@ -49,7 +69,7 @@ List configured servers/connections =================================== :: - $ ./bin/shpub.php server + $ shpub server rr test anoweco.bogo @@ -71,7 +91,7 @@ shpub has support for the following post types: - `repost `_ - `rsvp `_ -``shpub`` sends data form-encoded by default. +By default ``shpub`` sends data form-encoded. To send JSON requests, use the ``--json`` option. @@ -79,7 +99,7 @@ Create a like ============= :: - $ ./bin/shpub.php like http://example.org/ + $ shpub like http://example.org/ Like created at server http://anoweco.bogo/comment/23.htm @@ -87,7 +107,7 @@ Create a reply ============== :: - $ ./bin/shpub.php reply http://example.org/ "Hey, cool!" + $ shpub reply http://example.org/ "Hey, cool!" Reply created at server http://anoweco.bogo/comment/42.htm @@ -96,13 +116,13 @@ Create a note ============= A normal note:: - $ ./bin/shpub.php note "oh this is cool!" + $ shpub note "oh this is cool!" Note created at server http://known.bogo/2016/oh-this-is-cool.htm Note with an image:: - $ ./bin/shpub.php note -f image.jpg "this is so cute" + $ shpub note -f image.jpg "this is so cute" Note created at server http://known.bogo/2016/this-is-so-cute @@ -110,13 +130,13 @@ You can use ``-f`` several times to upload multiple files. URL image upload:: - $ ./bin/shpub.php note -f http://example.org/1.jpg "img url!" + $ shpub note -f http://example.org/1.jpg "img url!" Note created at server http://known.bogo/2016/img-url Load note content from a file:: - $ ./bin/shpub.php note - < /path/to/file.txt + $ shpub note - < /path/to/file.txt Note created at server http://known.bogo/2017/some-note @@ -125,11 +145,13 @@ Custom post types ================= You may create custom post types with the ``x`` command. This is useful if your micropub endpoint supports additional types, -like known's ``annotation`` type (comments and likes for posts). +like `known `__'s +`"annotation" type `__ +(comments and likes for posts). Create a comment to a known post:: - $ ./bin/shpub.php x annotation\ + $ shpub x annotation\ -x url=http://known.bogo/2016/example-domain-1\ -x type=reply\ -x username=barryf\ @@ -143,11 +165,11 @@ Delete/Undelete =============== You may delete and restore posts on micropub servers:: - $ ./bin/shpub.php delete http://known.bogo/2016/like + $ shpub delete http://known.bogo/2016/like Restore a deleted post:: - $ ./bin/shpub.php undelete http://known.bogo/2016/like + $ shpub undelete http://known.bogo/2016/like ======= @@ -168,33 +190,33 @@ Syndication targets =================== You may list the syndication targets defined on the server:: - $ ./bin/shpub.php targets + $ shpub targets IndieNews https://news.indieweb.org/en Then specify it when creating a post:: - $ ./bin/shpub.php article -x mp-syndicate-to=https://news.indieweb.org/en title text + $ shpub article -x mp-syndicate-to=https://news.indieweb.org/en title text ============ File uploads ============ Most post types allow file uploads. Simply use ``-f``:: - $ ./bin/shpub.php note -f path/to/image.jpg "image test" + $ shpub note -f path/to/image.jpg "image test" Note created at server http://known.bogo/2016/image-test The media endpoint is used automatically if the micropub endpoint has one. -To force shpub to directly upload the file and skip the media endpoint, +To force ``shpub`` to directly upload the file and skip the media endpoint, use the ``--direct-upload`` option:: - $ ./bin/shpub.php note --direct-upload -f path/to/image.jpg "direct upload" + $ shpub note --direct-upload -f path/to/image.jpg "direct upload" Use the ``upload`` command to upload files to the media endpoint without creating a post:: - $ ./bin/shpub.php upload /path/to/file.jpg /path/to/file2.jpg + $ shpub upload /path/to/file.jpg /path/to/file2.jpg Uploaded file /path/to/file.jpg http://test.bogo/micropub-media-endpoint/1474362040.2941/file.jpg Uploaded file /path/to/file2.jpg @@ -207,12 +229,26 @@ Debugging To debug ``shpub`` or your micropub endpoint, use the ``--debug`` option to see ``curl`` command equivalents to the shpub HTTP requests:: - $ ./bin/shpub.php -s known -d note "a simple note" + $ shpub -s known -d note "a simple note" curl -X POST -H 'User-Agent: shpub' -H 'Content-Type: application/x-www-form-urlencoded' -H 'Authorization: Bearer abc' -d 'h=entry' -d 'content=a simple note' 'http://known.bogo/micropub/endpoint' Post created at server http://known.bogo/2016/a-simple-note +See curl commands only +====================== +You may use the ``--dry-run`` option to make shpub not send any modifying +HTTP requests (e.g. POST and PUT). + +Together with ``--debug`` you can use this to get curl commands without sending +anything to the server:: + + $ shpub --debug --dry-run like example.org + curl -X POST -H 'User-Agent: shpub' -H 'Content-Type: application/x-www-form-urlencoded' -H 'Authorization: Bearer cafe' -d 'h=entry' -d 'like-of=http://example.org' 'http://anoweco.bogo/micropub.php' + Like created at server + http://example.org/fake-response + + =========== About shpub =========== -- 2.30.2 From 331f8cce4663fb447dd04fbc367cb626c433fadd Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Mon, 5 Feb 2018 08:35:10 +0100 Subject: [PATCH 11/16] Talk about releasing a new version --- README.rst | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.rst b/README.rst index ef807ac..5a615fa 100644 --- a/README.rst +++ b/README.rst @@ -249,6 +249,20 @@ anything to the server:: http://example.org/fake-response +=========== +Development +=========== + +Releasing a new version +======================= + +#. Add notes to ``ChangeLog`` +#. Update version number in ``build.xml`` and ``src/shpub/Cli.php`` +#. Run ``phing`` +#. Commit and tag the version +#. In the ``cweiske.de`` directory, run ``./scripts/update-shpub.sh`` + + =========== About shpub =========== -- 2.30.2 From 805caeece7df310f8edb090138058d4617f7c114 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Mon, 5 Feb 2018 08:35:26 +0100 Subject: [PATCH 12/16] Release 0.7.0 --- ChangeLog | 6 ++++++ build.xml | 2 +- src/shpub/Cli.php | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b486da..0b1e2dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-02-05 Christian Weiske + + * Add "--dry-run" option + * Fix space-after-"-x"-option error + * Version 0.7.0 + 2017-11-13 Christian Weiske * Add "x" command to post custom types diff --git a/build.xml b/build.xml index d48ad3d..84c7c6e 100644 --- a/build.xml +++ b/build.xml @@ -1,7 +1,7 @@ - + diff --git a/src/shpub/Cli.php b/src/shpub/Cli.php index 080bfe8..83eb5b6 100644 --- a/src/shpub/Cli.php +++ b/src/shpub/Cli.php @@ -96,7 +96,7 @@ class Cli $optParser = new \Console_CommandLine(); $optParser->name = 'shpub'; $optParser->description = 'Command line micropub client'; - $optParser->version = '0.6.0'; + $optParser->version = '0.7.0'; $optParser->subcommand_required = true; $optParser->addOption( -- 2.30.2 From 8ed6fa09d116dc02ff089dcffe8bb177c59a9d8e Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 19 Jun 2018 21:00:22 +0200 Subject: [PATCH 13/16] Explain that "server" command takes a parameter. Resolves: https://github.com/cweiske/shpub/issues/13 --- src/shpub/Command/Server.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/shpub/Command/Server.php b/src/shpub/Command/Server.php index b0200f2..3ce0c73 100644 --- a/src/shpub/Command/Server.php +++ b/src/shpub/Command/Server.php @@ -18,7 +18,9 @@ class Command_Server public static function opts(\Console_CommandLine $optParser) { $cmd = $optParser->addCommand('server'); - $cmd->description = 'List all connections'; + $cmd->description = 'List all connections' + . "\nPass the connection name to see all details:" + . " URL, user, endpoint URLs"; $cmd->addOption( 'verbose', array( -- 2.30.2 From 84a1ecae2787c64a96b104d5738a12073724f531 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 19 Jun 2018 21:04:48 +0200 Subject: [PATCH 14/16] Talk about server information in README Resolves: https://github.com/cweiske/shpub/issues/13 --- README.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/README.rst b/README.rst index 5a615fa..813586a 100644 --- a/README.rst +++ b/README.rst @@ -249,6 +249,22 @@ anything to the server:: http://example.org/fake-response +Server information +================== +To see which server, user and endpoint URLs ``shpub`` uses, pass the +server name to the ``server`` command:: + + $ shpub server commentpara.de + commentpara.de + URL: http://commentpara.de + User: https://commentpara.de/user/3.htm + Endpoints: + micropub: https://commentpara.de/micropub.php + media: + token: https://commentpara.de/token.php + authorization: https://commentpara.de/auth.php + + =========== Development =========== -- 2.30.2 From f0dde6f405cb0564e409d9cf2aaa38ef731f3dea Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Wed, 5 Sep 2018 22:18:21 +0200 Subject: [PATCH 15/16] Do not require "me" parameter in connection callback It is not required by the IndieAuth spec anymore, see https://www.w3.org/TR/indieauth/#authentication-response Resolves: https://github.com/cweiske/shpub/issues/14 --- src/shpub/Command/Connect.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/shpub/Command/Connect.php b/src/shpub/Command/Connect.php index 6ac5ed4..b39665b 100644 --- a/src/shpub/Command/Connect.php +++ b/src/shpub/Command/Connect.php @@ -279,7 +279,6 @@ class Command_Connect parse_str($parts['query'], $query); if (isset($query['code']) && isset($query['state']) - && isset($query['me']) ) { fwrite($sock, $responseOk); fclose($sock); -- 2.30.2 From 55c8ea2bdcbe7a8ad83c759aef5b0518e607fb69 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Wed, 5 Sep 2018 22:20:00 +0200 Subject: [PATCH 16/16] Release 0.7.1 --- ChangeLog | 5 +++++ build.xml | 2 +- src/shpub/Cli.php | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0b1e2dc..ed16f59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-09-05 Christian Weiske + + * Fix connection callback "me" parameter requirement + * Version 0.7.1 + 2018-02-05 Christian Weiske * Add "--dry-run" option diff --git a/build.xml b/build.xml index 84c7c6e..0f1c6a7 100644 --- a/build.xml +++ b/build.xml @@ -1,7 +1,7 @@ - + diff --git a/src/shpub/Cli.php b/src/shpub/Cli.php index 83eb5b6..354af72 100644 --- a/src/shpub/Cli.php +++ b/src/shpub/Cli.php @@ -96,7 +96,7 @@ class Cli $optParser = new \Console_CommandLine(); $optParser->name = 'shpub'; $optParser->description = 'Command line micropub client'; - $optParser->version = '0.7.0'; + $optParser->version = '0.7.1'; $optParser->subcommand_required = true; $optParser->addOption( -- 2.30.2