publish release *after* uploading the asset

[pharext/pharext.org] / app / Controller / Github / Hook / Receive.php

diff --git a/app/Controller/Github/Hook/Receive.php b/app/Controller/Github/Hook/Receive.php
index 62722edf99a75ce3c73fc08812864d1c747a606f..1ac998477d3493898fa98716caf903653358f271 100644 (file)
--- a/app/Controller/Github/Hook/Receive.php
+++ b/app/Controller/Github/Hook/Receive.php
@@ -8,9 +8,8 @@ use app\Model\Accounts;
 use app\Web;
 use http\Params;
 use pharext\Task;
-use pharext\SourceDir\Git;
-
-require_once __DIR__."/../../../../vendor/m6w6/pharext/src/pharext/Version.php";
+use pharext\Metadata;
+use pharext\SourceDir;
 
 class Receive implements Controller
 {
@@ -73,36 +72,57 @@ class Receive implements Controller
                        $response->getBody()->append("Not published");
                        return;
                }
+               if (!empty($release->release->assets)) {
+                       foreach ($release->release->assets as $asset) {
+                               if ($asset->content_type === "application/phar") {
+                                       /* we've already uploaded the asset when we created the release */
+                                       return;
+                               }
+                       }
+               }
                
-               $this->uploadAssetForRelease($release->release, $release->repository);
+               $this->uploadAssetForRelease($release->release, $release->repository)->send();
        }
        
        private function uploadAssetForRelease($release, $repo) {
                $this->setTokenForUser($repo->owner->login);
-               $asset = $this->createReleaseAsset($release, $repo);
-               $name = sprintf("%s-%s.ext.phar", $repo->name, $release->tag_name);
-               $url = uri_template($release->upload_url, compact("name"));
-               $this->github->createReleaseAsset($url, $asset, "application/phar", function($json) {
-                       $response = $this->app->getResponse();
-                       $response->setResponseCode(201);
-                       $response->setHeader("Location", $json->url);
-               })->send();
+               return $this->github->listHooks($repo->full_name, function($hooks) use($release, $repo) {
+                       $repo->hooks = $hooks;
+                       $asset = $this->createReleaseAsset($release, $repo);
+                       $name = sprintf("%s-%s.ext.phar", $repo->name, $release->tag_name);
+                       $url = uri_template($release->upload_url, compact("name"));
+                       $this->github->createReleaseAsset($url, $asset, "application/phar", function($json) use($release, $repo) {
+                               if ($release->draft) {
+                                       $this->github->publishRelease($repo->full_name, $release->id, $release->tag_name, function($json) {
+                                               $response = $this->app->getResponse();
+                                               $response->setResponseCode(201);
+                                               $response->setHeader("Location", $json->url);
+                                       });
+                               } else {
+                                       $response = $this->app->getResponse();
+                                       $response->setResponseCode(201);
+                                       $response->setHeader("Location", $json->url);
+                               }
+                       });
+               });
        }
        
        private function createReleaseAsset($release, $repo) {
-               $source = (new Task\GitClone($repo->clone_url, $release->tag_name))->run();
-               $iterator = new Git($source);
-               $meta = [
-                       "header" => sprintf("pharext v%s (c) Michael Wallner <mike@php.net>", \pharext\VERSION),
-                       "version" => \pharext\VERSION,
-                       "date" => date("Y-m-d"),
+               $hook = $this->github->checkRepoHook($repo);
+               $dir = (new Task\GitClone($repo->clone_url, $release->tag_name))->run();
+               if (!empty($hook->config->pecl)) {
+                       $src = new SoureDir\Pecl($dir);
+               } else {
+                       $src = new SourceDir\Git($dir);
+               }
+               $meta = Metadata::all() + [
                        "name" => $repo->name,
                        "release" => $release->tag_name,
-                       "license" => @file_get_contents(current(glob($iterator->getBaseDir()."/LICENSE*"))),
+                       "license" => $src->getLicense(),
                        "stub" => "pharext_installer.php",
-                       "type" => false ? "zend_extension" : "extension",
+                       "type" => !empty($hook->config->zend) ? "zend_extension" : "extension",
                ];
-               $file = (new Task\PharBuild($iterator, $meta))->run();
+               $file = (new Task\PharBuild($src, $meta))->run();
                return $file;
        }
        
@@ -115,7 +135,7 @@ class Receive implements Controller
                        return;
                }
                
-               $this->createReleaseFromTag($create->ref, $create->repository);
+               $this->createReleaseFromTag($create->ref, $create->repository)->send();
        }
        
        private function setTokenForUser($login) {
@@ -135,10 +155,8 @@ class Receive implements Controller
        
        private function createReleaseFromTag($tag, $repo) {
                $this->setTokenForUser($repo->owner->login);
-               $this->github->createRelease($repo->full_name, $tag, function($json) {
-                       $response = $this->app->getResponse();
-                       $response->setResponseCode(201);
-                       $response->setHeader("Location", $json->url);
-               })->send();
+               return $this->github->createRelease($repo->full_name, $tag, function($json) use($repo) {
+                       $this->uploadAssetForRelease($json, $repo);
+               });
        }
 }