diff --git a/app/config/platforms.php b/app/config/platforms.php index 71ce9043c..5c067eae8 100644 --- a/app/config/platforms.php +++ b/app/config/platforms.php @@ -177,6 +177,24 @@ return [ 'gitRepoName' => 'sdk-for-console', 'gitUserName' => 'appwrite', ], + [ + 'key' => 'cli', + 'name' => 'Command Line', + 'version' => '0.14.0', + 'url' => 'https://github.com/appwrite/sdk-for-cli', + 'package' => 'https://www.npmjs.com/package/appwrite-cli', + 'enabled' => true, + 'beta' => true, + 'dev' => false, + 'hidden' => false, + 'family' => APP_PLATFORM_CONSOLE, + 'prism' => 'bash', + 'source' => \realpath(__DIR__ . '/../sdks/console-cli'), + 'gitUrl' => 'git@github.com:appwrite/sdk-for-cli.git', + 'gitRepoName' => 'sdk-for-cli', + 'gitUserName' => 'appwrite', + 'gitBranch' => 'main', + ], ], ], @@ -205,24 +223,6 @@ return [ 'gitUserName' => 'appwrite', 'gitBranch' => 'master', ], - [ - 'key' => 'node-cli', - 'name' => 'Command Line', - 'version' => '0.13.0', - 'url' => 'https://github.com/appwrite/sdk-for-node-cli', - 'package' => 'https://www.npmjs.com/package/appwrite-cli', - 'enabled' => true, - 'beta' => true, - 'dev' => false, - 'hidden' => false, - 'family' => APP_PLATFORM_CONSOLE, - 'prism' => 'bash', - 'source' => \realpath(__DIR__ . '/../sdks/server-cli'), - 'gitUrl' => 'git@github.com:appwrite/sdk-for-cli.git', - 'gitRepoName' => 'sdk-for-node-cli', - 'gitUserName' => 'appwrite', - 'gitBranch' => 'master', - ], [ 'key' => 'deno', 'name' => 'Deno', @@ -367,24 +367,6 @@ return [ 'gitUserName' => 'appwrite', 'gitBranch' => 'master', ], - [ - 'key' => 'cli', - 'name' => 'Command Line', - 'version' => '0.13.0', - 'url' => 'https://github.com/appwrite/sdk-for-cli', - 'package' => 'https://github.com/appwrite/sdk-for-cli', - 'enabled' => true, - 'beta' => true, - 'dev' => false, - 'hidden' => true, - 'family' => APP_PLATFORM_SERVER, - 'prism' => 'bash', - 'source' => \realpath(__DIR__ . '/../sdks/server-cli'), - 'gitUrl' => 'git@github.com:appwrite/sdk-for-cli.git', - 'gitRepoName' => 'sdk-for-cli', - 'gitUserName' => 'appwrite', - 'gitBranch' => 'master', - ], [ 'key' => 'kotlin', 'name' => 'Kotlin', diff --git a/app/executor.php b/app/executor.php index ff313a513..7da7e8b4c 100644 --- a/app/executor.php +++ b/app/executor.php @@ -303,8 +303,8 @@ App::post('/v1/runtimes') Console::success('Build Stage completed in ' . ($endTime - $startTime) . ' seconds'); } catch (Throwable $th) { - Console::error('Build failed: ' . $th->getMessage()); - throw new Exception($th->getMessage(), 500); + Console::error('Build failed: ' . $th->getMessage() . $stdout); + throw new Exception($th->getMessage() . $stdout, 500); } finally { if (!empty($containerId) && $remove) { $orchestration->remove($containerId, true); diff --git a/app/tasks/sdks.php b/app/tasks/sdks.php index d4f83651f..22878e9ac 100644 --- a/app/tasks/sdks.php +++ b/app/tasks/sdks.php @@ -84,17 +84,24 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND break; case 'cli': $config = new CLI(); - $config->setComposerVendor('appwrite'); - $config->setComposerPackage('cli'); + $config->setNPMPackage('appwrite-cli'); $config->setExecutableName('appwrite'); - $config->setLogo(" + $config->setLogo(json_encode(" _ _ _ ___ __ _____ /_\ _ __ _ ____ ___ __(_) |_ ___ / __\ / / \_ \ - //_\\| '_ \| '_ \ \ /\ / / '__| | __/ _ \ / / / / / /\/ + //_\\\| '_ \| '_ \ \ /\ / / '__| | __/ _ \ / / / / / /\/ / _ \ |_) | |_) \ V V /| | | | || __/ / /___/ /___/\/ /_ \_/ \_/ .__/| .__/ \_/\_/ |_| |_|\__\___| \____/\____/\____/ - |_| |_| - "); + |_| |_| + +")); + $config->setLogoUnescaped(" + _ _ _ ___ __ _____ + /_\ _ __ _ ____ ___ __(_) |_ ___ / __\ / / \_ \ + //_\\\| '_ \| '_ \ \ /\ / / '__| | __/ _ \ / / / / / /\/ + / _ \ |_) | |_) \ V V /| | | | || __/ / /___/ /___/\/ /_ + \_/ \_/ .__/| .__/ \_/\_/ |_| |_|\__\___| \____/\____/\____/ + |_| |_| "); break; case 'php': $config = new PHP(); diff --git a/composer.lock b/composer.lock index 3b0f38cf0..39b274a58 100644 --- a/composer.lock +++ b/composer.lock @@ -3075,7 +3075,7 @@ "source": { "type": "git", "url": "https://github.com/appwrite/sdk-generator", - "reference": "b3813a4c947d65a2aba7ac29cb8681bbbbc862c3" + "reference": "87e534758a0bad4b2de05a3570f8cc33418687cb" }, "require": { "ext-curl": "*", @@ -3110,7 +3110,7 @@ } ], "description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms", - "time": "2022-02-23T11:38:35+00:00" + "time": "2022-02-24T22:40:23+00:00" }, { "name": "composer/pcre", @@ -3266,16 +3266,16 @@ }, { "name": "composer/xdebug-handler", - "version": "2.0.4", + "version": "2.0.5", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "0c1a3925ec58a4ec98e992b9c7d171e9e184be0a" + "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/0c1a3925ec58a4ec98e992b9c7d171e9e184be0a", - "reference": "0c1a3925ec58a4ec98e992b9c7d171e9e184be0a", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/9e36aeed4616366d2b690bdce11f71e9178c579a", + "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a", "shasum": "" }, "require": { @@ -3312,7 +3312,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/2.0.4" + "source": "https://github.com/composer/xdebug-handler/tree/2.0.5" }, "funding": [ { @@ -3328,7 +3328,7 @@ "type": "tidelift" } ], - "time": "2022-01-04T17:06:45+00:00" + "time": "2022-02-24T20:20:32+00:00" }, { "name": "dnoegel/php-xdg-base-dir",