@corva/create-app 0.27.0-rc.0 → 0.28.0-2

package/{scripts → lib/scripts}/utils/version.js

@@ -1,10 +1,9 @@
 const NpmApi = require('npm-api');
 const chalk = require('chalk');
-const semverGt = require('semver/functions/gt');
-const semverInc = require('semver/functions/inc');
+const semver = require('semver');
 const inquirer = require('inquirer');
 
-const packageJson = require('../../package.json');
+const packageJson = require('../../../package.json');
 const npm = new NpmApi();
 const errorStyle = chalk.bold.red;
 
@@ -16,7 +15,7 @@ async function ensureLatestVersion() {
   const currentVersion = getCurrentVersion();
   const latestVersion = await getLatestVersion();
 
-  const isCurrentVersionOutdated = semverGt(latestVersion, currentVersion);
+  const isCurrentVersionOutdated = semver.gt(latestVersion, currentVersion);
   if (isCurrentVersionOutdated) {
     console.log(errorStyle('****************************************************************'));
     console.log(chalk`
@@ -34,10 +33,12 @@ async function ensureLatestVersion() {
 
 // NOTE: Show user-friendly warning if version is outdated
 async function warnIfOutdated() {
+  process.stdout.write('Checking for updates...');
+
   const currentVersion = getCurrentVersion();
   const latestVersion = await getLatestVersion();
 
-  const isCurrentVersionOutdated = semverGt(latestVersion, currentVersion);
+  const isCurrentVersionOutdated = semver.gt(latestVersion, currentVersion);
 
   if (isCurrentVersionOutdated) {
     console.log('****************************************************************');
@@ -49,35 +50,57 @@ async function warnIfOutdated() {
 
     `);
     console.log('****************************************************************');
+  } else {
+    process.stdout.write('  ✅  \n');
   }
 }
 
-const BUMP_OPTIONS = { 1: 'patch', 2: 'minor', 3: 'major' };
 const PROMPT_MESSAGE = `Bumping package version:
-${chalk.bold` Please select one of the options below or press ENTER for patch or type custom version:`}
-  1. patch (x.y.z+1) 
-  2. minor (x.y+1.z)
-  3. major (x+1.y.z)
-  4. skip
+${chalk.bold` Please select one of the options below:`}
   `;
 
-async function getIncreasedVersion(currentVersion, { bumpVersion }) {
-  // NOTE: Either use provided bumpVersion for increase or prompt user
-  if (bumpVersion) return semverInc(currentVersion, bumpVersion) || bumpVersion; // Use option providedw
+const ensureBumpVersion = async (bumpVersion) => {
+  if (bumpVersion) {
+    return bumpVersion;
+  }
 
-  let version = currentVersion;
-  const { option } = await inquirer.prompt({
-    message: PROMPT_MESSAGE,
-    name: 'option',
-    type: 'string',
-    prefix: '',
-    default: '1',
-  });
-  if (option === '4') return version; // SKIP version bump, return current version
+  const { option, custom } = await inquirer.prompt([
+    {
+      message: PROMPT_MESSAGE,
+      name: 'option',
+      type: 'list',
+      choices: [
+        { value: 'major', name: 'major (x+1.y.z)' },
+        { value: 'minor', name: 'minor (x.y+1.z)' },
+        { value: 'patch', name: 'patch (x.y.z+1)' },
+        new inquirer.Separator(),
+        { value: 'custom', name: 'Enter a custom version' },
+        { value: 'skip', name: 'Skip version bump' },
+      ],
+      default: 'patch',
+    },
+    {
+      message: 'Enter custom version',
+      name: 'custom',
+      when: (answers) => answers.option === 'custom',
+      type: 'input',
+      validate: (input) => (semver.valid(input) ? true : 'Invalid semver version'),
+    },
+  ]);
+
+  return option === 'custom' ? custom : option;
+};
+
+async function getIncreasedVersion(version, { bumpVersion: releaseTypeOrNewVersion }) {
+  if (releaseTypeOrNewVersion === 'skip') {
+    return version;
+  }
 
-  const semverReleaseOption = option ? BUMP_OPTIONS[option] || option : 'patch'; // Patch by default
+  if (semver.valid(releaseTypeOrNewVersion)) {
+    return releaseTypeOrNewVersion;
+  }
 
-  return semverInc(version, semverReleaseOption) || option;
+  return semver.inc(version, releaseTypeOrNewVersion);
 }
 
-module.exports = { ensureLatestVersion, warnIfOutdated, getIncreasedVersion };
+module.exports = { ensureLatestVersion, warnIfOutdated, getIncreasedVersion, ensureBumpVersion };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@corva/create-app",
-    "version": "0.27.0-rc.0",
+    "version": "0.28.0-2",
     "private": false,
     "description": "Create app to use it in CORVA.AI",
     "keywords": [
@@ -16,14 +16,12 @@
     },
     "license": "MIT",
     "bin": {
-        "create-corva-app": "./index.js"
+        "create-corva-app": "./bin/create-corva-app.js"
     },
     "files": [
-        "index.js",
-        "constants",
-        "helpers",
-        "template",
-        "scripts"
+        "bin/**/*.js",
+        "lib/**/*.js",
+        "templates"
     ],
     "scripts": {
         "lint": "prettier . --write",
@@ -36,16 +34,20 @@
         "archiver": "^5.3.0",
         "axios": "^0.25.0",
         "chalk": "4.1.0",
-        "commander": "^8.2.0",
+        "commander": "^9.1.0",
         "conventional-changelog-cli": "^2.1.0",
         "cross-spawn": "7.0.3",
+        "debug": "^4.3.4",
         "dotenv": "^16.0.0",
         "envinfo": "7.5.1",
         "figlet": "^1.5.0",
         "form-data": "^4.0.0",
         "fs-extra": "9.0.1",
+        "glob": "^8.0.1",
         "hyperquest": "2.1.3",
         "inquirer": "7.3.2",
+        "is-glob": "^4.0.3",
+        "lodash": "^4.17.21",
         "npm-api": "^1.0.0",
         "semver": "7.3.2",
         "tar-pack": "3.4.1",
@@ -58,6 +60,9 @@
         "prettier": "^2.4.1",
         "standard-version": "^9.0.0"
     },
+    "engines": {
+        "node": "^12.20.0 || >=14"
+    },
     "standard-version": {
         "skip": {
             "tag": true

package/{template → templates}/scheduler/node/package.json

@@ -4,7 +4,7 @@
     "description": "My Dev Center Polling Scheduler Data App",
     "main": "index.js",
     "scripts": {
-        "bundle": "zip -r $npm_package_name-$npm_package_version.zip package.json $LOCKFILE manifest.json index.js src",
+        "bundle": "create-corva-app zip .",
         "test": "npm audit --production && npm run unit",
         "unit": "jest"
     },

package/templates/scheduler/node-ts/lib/processor.js

@@ -0,0 +1,16 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.Processor = void 0;
+class Processor {
+  constructor(apiClient, logger) {
+    this.apiClient = apiClient;
+    this.logger = logger;
+  }
+  async process(event) {
+    this.logger.debug({ event }, 'Event');
+    const { asset_id: assetId, schedule_start: scheduleStart, interval } = event;
+    this.logger.info(`Processing event. Asset: ${assetId}. Schedule start: ${scheduleStart}`);
+  }
+}
+exports.Processor = Processor;
+//# sourceMappingURL=processor.js.map

package/templates/scheduler/node-ts/lib/processor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"processor.js","sourceRoot":"","sources":["processor.ts"],"names":[],"mappings":";;;AAEA,MAAa,SAAS;IACpB,YAAoB,SAAgC,EAAU,MAAgC;QAA1E,cAAS,GAAT,SAAS,CAAuB;QAAU,WAAM,GAAN,MAAM,CAA0B;IAAG,CAAC;IAElG,KAAK,CAAC,OAAO,CAAC,KAA6C;QACzD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,CAAC,CAAC;QAEtC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;QAE7E,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4BAA4B,OAAO,qBAAqB,aAAa,EAAE,CAAC,CAAC;IAC5F,CAAC;CACF;AAVD,8BAUC"}

package/{template → templates}/scheduler/node-ts/package.json

@@ -4,7 +4,7 @@
     "description": "My Dev Center Polling Scheduler Data App",
     "main": "index.js",
     "scripts": {
-        "bundle": "zip -r $npm_package_name-$npm_package_version.zip package.json $LOCKFILE manifest.json index.js lib -x '*.ts'",
+        "bundle": "create-corva-app zip .",
         "test": "npm audit --production && npm run unit",
         "build": "tsc -p tsconfig.build.json",
         "unit": "jest"

package/templates/scheduler/python/Makefile

@@ -0,0 +1,15 @@
+.PHONY: default install bundle release test
+.DEFAULT_GOAL := default
+
+default: install
+install: venv
+	@. venv/bin/activate && pip install -r requirements.txt
+venv:
+	@test -d venv || python -m venv venv
+bundle:
+	@create-corva-app zip . --bump-version=skip
+release:
+	@create-corva-app release . --bump-version=skip
+test: venv
+	@. venv/bin/activate && pytest
+

package/templates/scheduler/python/README.md

@@ -0,0 +1,31 @@
+# Dev Center Python Polling Scheduler Data App
+
+## Getting started
+
+[Python SDK Documentation](https://corva-ai.github.io/python-sdk)
+
+### 1. Install
+
+You need to have `make` installed:
+    
+- Windows: [Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/install)
+- OS X: [Command Line Tools for Xcode](https://developer.apple.com/download/more/)
+- Linux: refer to your distro-specific docs
+
+To install dependencies run:
+
+```sh
+make
+```
+
+### 2. Run Tests
+
+```sh
+make test
+```
+
+### 3. Create app zip
+
+```sh
+make bundle
+```

package/{template → templates}/stream/node/package.json

@@ -4,7 +4,7 @@
     "description": "My Dev Center Real-Time Stream Data App",
     "main": "index.js",
     "scripts": {
-        "bundle": "zip -r $npm_package_name-$npm_package_version.zip package.json $LOCKFILE manifest.json index.js src",
+        "bundle": "create-corva-app zip .",
         "test": "npm audit --production && npm run unit",
         "unit": "jest"
     },

package/{template → templates}/stream/node-ts/package.json

@@ -4,7 +4,7 @@
     "description": "My Dev Center Real-Time Stream Data App",
     "main": "index.js",
     "scripts": {
-        "bundle": "zip -r $npm_package_name-$npm_package_version.zip package.json $LOCKFILE manifest.json index.js lib -x '*.ts'",
+        "bundle": "create-corva-app zip .",
         "test": "npm audit --production && npm run unit",
         "build": "tsc -p tsconfig.build.json",
         "unit": "jest"

package/templates/stream/python/Makefile

@@ -0,0 +1,15 @@
+.PHONY: default install bundle release test
+.DEFAULT_GOAL := default
+
+default: install
+install: venv
+	@. venv/bin/activate && pip install -r requirements.txt
+venv:
+	@test -d venv || python -m venv venv
+bundle:
+	@create-corva-app zip . --bump-version=skip
+release:
+	@create-corva-app release . --bump-version=skip
+test: venv
+	@. venv/bin/activate && pytest
+

package/templates/stream/python/README.md

@@ -0,0 +1,31 @@
+# Dev Center Python Real-Time Stream Data App
+
+## Getting started
+
+[Python SDK Documentation](https://corva-ai.github.io/python-sdk)
+
+### 1. Install
+
+You need to have `make` installed:
+    
+- Windows: [Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/install)
+- OS X: [Command Line Tools for Xcode](https://developer.apple.com/download/more/)
+- Linux: refer to your distro-specific docs
+
+To install dependencies run:
+
+```sh
+make
+```
+
+### 2. Run Tests
+
+```sh
+make test
+```
+
+### 3. Create app zip
+
+```sh
+make bundle
+```

package/{template → templates}/task/node/package.json

@@ -4,7 +4,7 @@
     "description": "My Dev Center Task Data App",
     "main": "index.js",
     "scripts": {
-        "bundle": "zip -r $npm_package_name-$npm_package_version.zip package.json $LOCKFILE manifest.json index.js src",
+        "bundle": "create-corva-app zip .",
         "test": "npm audit --production && npm run unit",
         "unit": "jest"
     },

package/{template → templates}/task/node-ts/package.json

@@ -4,7 +4,7 @@
     "description": "My Dev Center Task Data App",
     "main": "index.js",
     "scripts": {
-        "bundle": "zip -r $npm_package_name-$npm_package_version.zip package.json $LOCKFILE manifest.json index.js lib -x '*.ts'",
+        "bundle": "create-corva-app zip .",
         "test": "npm audit --production && npm run unit",
         "build": "tsc -p tsconfig.build.json",
         "unit": "jest"

package/templates/task/python/Makefile

@@ -0,0 +1,15 @@
+.PHONY: default install bundle release test
+.DEFAULT_GOAL := default
+
+default: install
+install: venv
+	@. venv/bin/activate && pip install -r requirements.txt
+venv:
+	@test -d venv || python -m venv venv
+bundle:
+	@create-corva-app zip . --bump-version=skip
+release:
+	@create-corva-app release . --bump-version=skip
+test: venv
+	@. venv/bin/activate && pytest
+

package/templates/task/python/README.md

@@ -0,0 +1,31 @@
+# Dev Center Python Task Data App
+
+## Getting started
+
+[Python SDK Documentation](https://corva-ai.github.io/python-sdk)
+
+### 1. Install
+
+You need to have `make` installed:
+    
+- Windows: [Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/install)
+- OS X: [Command Line Tools for Xcode](https://developer.apple.com/download/more/)
+- Linux: refer to your distro-specific docs
+
+To install dependencies run:
+
+```sh
+make
+```
+
+### 2. Run Tests
+
+```sh
+make test
+```
+
+### 3. Create app zip
+
+```sh
+make bundle
+```

package/scripts/ui/index.js

@@ -1,7 +0,0 @@
-const zipAppSource = require('./zipAppSource');
-const releaseAppZip = require('./releaseAppZip');
-
-module.exports = {
-  zipAppSource,
-  releaseAppZip,
-};