cloudron 5.9.0 → 5.11.0

package/bin/cloudron

@@ -36,8 +36,9 @@ program.option('--server <server>', 'Cloudron domain')
     .option('--allow-selfsigned', 'Accept self signed SSL certificate')
     .option('--accept-selfsigned', 'Accept self signed SSL certificate');
 
-// this is a separate binary since global options are not applicable
+// these are separate binaries since global options are not applicable
 program.command('appstore', 'Cloudron appstore commands');
+program.command('repo', 'Cloudron repo commands');
 
 const backupCommand = program.command('backup')
     .description('App backup commands');

package/bin/cloudron-repo

@@ -0,0 +1,18 @@
+#!/usr/bin/env node
+
+'use strict';
+
+const { program } = require('commander'),
+    repoActions = require('../src/repo-actions.js');
+
+program.version(require('../package.json').version);
+
+program.command('tag <version>')
+    .description('Creates a new release with given tag')
+    .action(repoActions.tag);
+
+program.command('publish')
+    .description('Publish to appstore')
+    .action(repoActions.publish);
+
+program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "5.9.0",
+  "version": "5.11.0",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",

package/src/appstore-actions.js

@@ -72,7 +72,7 @@ async function authenticate(options) {
 
     config.setAppStoreToken(null);
 
-    const response = await superagent.post(createUrl('/api/v1/login')).auth(email, password).send({ totpToken: options.totpToken });
+    const response = await superagent.post(createUrl('/api/v1/login')).auth(email, password).send({ totpToken: options.totpToken }).ok(() => true);
     if (response.statusCode === 401 && response.body.message.indexOf('TOTP') !== -1) {
         if (response.body.message === 'TOTP token missing') console.log('A 2FA TOTP Token is required for this account.');
 

package/src/build-actions.js

@@ -323,7 +323,7 @@ function build(options) {
             url = readlineSync.question('Enter build service URL: ', { });
         }
 
-        if (!url.startsWith('https://')) url = `https://${url}`;
+        if (url.indexOf('://') === -1) url = `https://${url}`;
         buildService.url = url;
     }
 

package/src/repo-actions.js

@@ -0,0 +1,97 @@
+/* jshint node:true */
+
+'use strict';
+
+const { exit, locateManifest } = require('./helper.js'),
+    execSync = require('child_process').execSync,
+    fs = require('fs'),
+    manifestFormat = require('cloudron-manifestformat'),
+    path = require('path'),
+    safe = require('safetydance'),
+    semver = require('semver');
+
+exports = module.exports = {
+    tag,
+    publish
+};
+
+async function tag(version, options) {
+    const basename = `${path.basename(process.cwd())}`;
+    if (!basename.endsWith('-app')) return exit('Does not look like a app repo. Has to end with -app');
+
+    if (!semver.valid(version)) return exit(`${version} is not a valid semver`);
+
+    const latestTag = safe.child_process.execSync('git describe --tags --abbrev=0', { encoding: 'utf8' });
+    if (safe.error) return exit(`Failed to get last release tag: ${safe.error.message}`);
+
+    const manifestFilePath = locateManifest();
+    if (!manifestFilePath) return exit('Could not locate CloudronManifest.json');
+
+    const latestVersion = latestTag.match(/v(.*)/)[1];
+
+    if (semver.lte(version, latestVersion)) return exit(`${version} is less than or equal to last repo tag ${latestVersion}`);
+    if (semver.inc(latestVersion, 'major') !== version
+        && semver.inc(latestVersion, 'minor') !== version
+        && semver.inc(latestVersion, 'patch') !== version) {
+            return exit(`${version} is not the next major/minor/patch of last published version ${latestVersion}`);
+    }
+
+    const latestRenovateCommit = safe.child_process.execSync('git log -n 1 --committer=renovatebot@cloudron.io --pretty="format:%h,%aI,%s"', { encoding: 'utf8' });
+    if (!latestRenovateCommit) return exit('Could not find a commit from renovate bot');
+
+    const [ abbrevHash, commitDate, commitMessage ] = latestRenovateCommit.split(',');
+    const cleanDate = commitDate.replace(/T.*/, '').replace(/[-]/g, '');
+    const repoDir = path.dirname(manifestFilePath);
+    const repoName = path.basename(repoDir).replace('-app', '');
+    const dockerImage = options.image || `cloudron/${repoName}:${cleanDate}-${abbrevHash}`;
+    const upstreamVersion = commitMessage.match(/update dependency .* to (.*)/)[1];
+
+    const result = manifestFormat.parseFile(manifestFilePath);
+    if (result.error) throw new Error(`Invalid CloudronManifest.json: ${result.error.message}`);
+    const { manifest } = result;
+
+    console.log(`Enter the changelog for ${upstreamVersion}: (press ctrl+D to finish)`);
+    const rawChangelog = fs.readFileSync(0, 'utf-8');
+    const mdChangelog = rawChangelog.split('\n').map(line => {
+        line = line.trim();
+        line = line.replace(/[\u{0080}-\u{FFFF}]/gu, ''); // only ascii
+        line = line.replace(/^\* /, ''); // replace any "* " in the front
+        return line ? `* ${line}` : '';
+    }).join('\n');
+    const newChangelog = `\n[${version}]\n* Update ${manifest.title} to ${upstreamVersion}\n${mdChangelog}\n`;
+    const changelogFile = `${repoDir}/${manifest.changelog.replace('file://', '')}`; // sometimes CHANGELOG, sometimes CHANGELOG.md
+    fs.appendFileSync(changelogFile, newChangelog);
+
+    manifest.version = version;
+    manifest.upstreamVersion = upstreamVersion;
+    fs.writeFileSync('CloudronManifest.json', JSON.stringify(manifest, null, 2));
+
+    // set GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL if needed
+    execSync(`git commit -a -m 'Version ${version}'`);
+    execSync(`git tag v${version} -a -m 'Version ${version}'`);
+    safe.child_process.execSync('git push --tags origin');
+    if (safe.error) return exit(`Failed to push tag and commits: ${safe.error.message}`);
+
+    console.log('Created tag and pushed to git');
+}
+
+async function publish(options) {
+    const manifestFilePath = locateManifest();
+    if (!manifestFilePath) return exit('Could not locate CloudronManifest.json');
+
+    const latestRenovateCommit = safe.child_process.execSync('git log -n 1 --committer=renovatebot@cloudron.io --pretty="format:%h,%aI,%s"', { encoding: 'utf8' });
+    if (!latestRenovateCommit) return exit('Could not find a commit from renovate bot');
+
+    const [ abbrevHash, commitDate ] = latestRenovateCommit.split(',');
+    const cleanDate = commitDate.replace(/T.*/, '').replace(/[-]/g, '');
+    const repoDir = path.dirname(manifestFilePath);
+    const repoName = path.basename(repoDir).replace('-app', '');
+    const dockerImage = options.image || `cloudron/${repoName}:${cleanDate}-${abbrevHash}`;
+
+    safe.child_process.execSync(`cloudron appstore upload --image ${dockerImage}`);
+    if (safe.error) return exit(`Failed to publish image to appstore: ${safe.error.message}`);
+    execSync(`cloudron appstore submit`);
+    execSync(`cloudron appstore approve`);
+
+    console.log('Published to appstore');
+}