cloudron 5.3.0 → 5.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "5.3.0",
+  "version": "5.3.2",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",
@@ -10,7 +10,7 @@
     "url": "https://git.cloudron.io/cloudron/cloudron-cli.git"
   },
   "scripts": {
-    "test": "./node_modules/.bin/mocha test/*-test.js"
+    "test": "./node_modules/.bin/mocha test/test.js"
   },
   "bin": {
     "cloudron": "./bin/cloudron"
@@ -18,7 +18,7 @@
   "author": "Cloudron Developers <support@cloudron.io>",
   "dependencies": {
     "async": "^3.2.4",
-    "cloudron-manifestformat": "^5.19.1",
+    "cloudron-manifestformat": "^5.20.0",
     "commander": "^9.5.0",
     "debug": "^4.3.4",
     "delay": "^5.0.0",

package/src/actions.js

@@ -92,7 +92,7 @@ function createRequest(method, apiPath, options) {
 function requestError(response) {
     if (response.statusCode === 401) return 'Invalid token. Use cloudron login again.';
 
-    return `${response.statusCode} message: ${response.body.message || response.body}`; // body is sometimes just a string like in 401
+    return `${response.statusCode} message: ${response.body.message || JSON.stringify(response.body)}`; // body is sometimes just a string like in 401
 }
 
 async function selectDomain(location, options) {
@@ -561,7 +561,7 @@ async function install(localOptions, cmd) {
         const result = await getManifest(options.appstoreId || '');
         const { manifest, manifestFilePath } = result;
 
-        if (!manifest.dockerImage) {
+        if (!manifest.dockerImage) { // not a manifest from appstore
             const sourceDir = path.dirname(manifestFilePath);
             const image = options.image || config.getAppConfig(sourceDir).dockerImage;
 
@@ -773,7 +773,7 @@ async function update(localOptions, cmd) {
 
         let data = {};
 
-        if (!manifest.dockerImage) {
+        if (!manifest.dockerImage) { // not a manifest from appstore
             const sourceDir = path.dirname(manifestFilePath);
             const image = options.image || config.getAppConfig(sourceDir).dockerImage;
 

package/test/{cloudron-test.js → test.js}

@@ -144,9 +144,9 @@ describe('Push', function () {
     });
 
     it('can push to directory', function () {
-        var testFile = __dirname + '/cloudron-test.js';
+        var testFile = __dirname + '/test.js';
         cli(util.format('push --app %s %s /tmp/', app.id, testFile));
-        var out = cli(util.format('exec --app %s md5sum /tmp/cloudron-test.js', app.id));
+        var out = cli(util.format('exec --app %s md5sum /tmp/test.js', app.id));
         expect(out.stdout).to.contain(md5(testFile));
     });
 
@@ -165,9 +165,9 @@ describe('Push', function () {
     });
 
     it('can push a directory', function () {
-        var testDir = __dirname, testFile = __dirname + '/cloudron-test.js';
+        var testDir = __dirname, testFile = __dirname + '/test.js';
         cli(util.format('push --app %s %s /run', app.id, testDir));
-        var out = cli(util.format('exec --app %s md5sum /run/' + path.basename(__dirname) + '/cloudron-test.js', app.id));
+        var out = cli(util.format('exec --app %s md5sum /run/' + path.basename(__dirname) + '/test.js', app.id));
         expect(out.stdout).to.contain(md5(testFile));
     });