@sap/cds-dk 6.2.3 → 6.3.1

package/lib/init/template/multitenancy/index.js

@@ -1,7 +1,7 @@
-const cds = require('../../../cds'), { fs, path } = cds.utils
-const TemplateBase = require('../templateBase')
+const cds = require('../../../cds')
+const { path, copy, exists } = cds.utils
 const ProjectReader = require('../../util/projectReader')
-
+const { mergeJSON, mergeYAML, sortDependencies } = require('../../util/merge')
 const {
   srvNode, srvJava, // Server
   mtxSidecar, // Additional Modules
@@ -9,10 +9,17 @@ const {
   providedMtxAPI, srvAPI, providedMtxSidecarAPI, requiredMtxSidecarAPI // APIs
 } = require('../_merging/registry-mta');
 
-module.exports = class MultitenancyTemplate extends TemplateBase {
+module.exports = class MultitenancyTemplate extends require('../templateBase') {
   constructor(projectPath, generator) {
     super(projectPath, generator, __dirname)
-    this.projectReader = new ProjectReader(this)
+    this.projectReader = new ProjectReader(projectPath)
+  }
+
+  static hasFacet(env, projectPath, options) {
+    // REVISIT: Check if this can be simplified
+    return options?.add?.has('mtx') || options?.add?.has('multitenancy') ||
+           !!env.requires?.multitenancy || !!env.requires?.db?.multiTenant ||
+           this.isJava && exists(path.join(projectPath, 'mtx', 'sidecar')) || false
   }
 
   async run() {
@@ -21,22 +28,22 @@ module.exports = class MultitenancyTemplate extends TemplateBase {
     if (isNodejs) {
       const packageJSONPath = path.join(this.projectPath, 'package.json')
       const cdsTemplateFile = forProfile ? 'cds.package.json.hbs' : 'cds.package.json'
-      await this.templateUtil.mergeJSON(packageJSONPath, path.join(__dirname, 'files', cdsTemplateFile), projectDescriptor)
-      await this.templateUtil.mergeJSON(packageJSONPath, path.join(__dirname, 'files', 'dependencies.package.json'))
-      await this.templateUtil.sortDependencies(packageJSONPath)
+      await mergeJSON(packageJSONPath, path.join(__dirname, 'files', cdsTemplateFile), projectDescriptor)
+      await mergeJSON(packageJSONPath, path.join(__dirname, 'files', 'dependencies.package.json'))
+      await sortDependencies(packageJSONPath)
     } else if (isJava) {
       const cdsrcJSONPath = path.join(this.projectPath, '.cdsrc.json')
-      await this.templateUtil.mergeJSON(cdsrcJSONPath, path.join(__dirname, 'files', 'java', '.cdsrc.json'))
-      await fs.copy(path.join(__dirname, 'files', 'java', 'package.json'), path.join(this.projectPath, 'mtx', 'sidecar', 'package.json'))
+      await mergeJSON(cdsrcJSONPath, path.join(__dirname, 'files', 'java', '.cdsrc.json'))
+      await copy(path.join(__dirname, 'files', 'java', 'package.json'), path.join(this.projectPath, 'mtx', 'sidecar', 'package.json'))
     }
     await this.runDependentMerging()
   }
 
   async runDependentMerging() {
     const projectDescriptor = await this.projectReader.read()
-    const { isNodejs, isJava, hasMtaDeployment, hasHelmDeployment, hasApprouter, hasXsuaa, hasHana } = projectDescriptor.cap
+    const { isNodejs, isJava, hasMta, hasHelm, hasApprouter, hasXsuaa, hasHana } = projectDescriptor.cap
 
-    if (hasMtaDeployment) {
+    if (hasMta) {
       const modules = isNodejs ? [srvNode] : [srvJava, mtxSidecar]
       const srv = isNodejs ? srvNode : srvJava
       const services = [saasRegistry]
@@ -68,11 +75,11 @@ module.exports = class MultitenancyTemplate extends TemplateBase {
       const templateMtaPath = path.join(__dirname, `files`, `mta.yaml.hbs`)
       const mtaPath = path.join(this.projectPath, 'mta.yaml')
       const mergingRules = { additions, overwrites, relationships }
-      await this.templateUtil.mergeYAML(mtaPath, templateMtaPath, projectDescriptor, mergingRules)
+      await mergeYAML(mtaPath, templateMtaPath, projectDescriptor, mergingRules)
     }
 
-    if (hasHelmDeployment) {
-      await this.templateUtil.mergeYAML(
+    if (hasHelm) {
+      await mergeYAML(
         path.join(this.projectPath, 'chart', 'values.yaml'),
         {
           xsuaa: {
@@ -83,12 +90,12 @@ module.exports = class MultitenancyTemplate extends TemplateBase {
         null, { forceOverwrite: true }
       )
       //if (hasXsuaa) { // REVISIT: Can we get rid of this dependency?
-        await fs.copy(
+        await copy(
           path.join(__dirname, 'files', 'xsuaa.yaml'),
           path.join(this.projectPath, 'chart', 'templates', 'xsuaa.yaml')
         )
       //}
-      await fs.copy(
+      await copy(
         path.join(__dirname, 'files', 'saas-registry.yaml'),
         path.join(this.projectPath, 'chart', 'templates', 'saas-registry.yaml')
       )
@@ -107,7 +114,7 @@ module.exports = class MultitenancyTemplate extends TemplateBase {
     }
 
     if (hasXsuaa) {
-      await this.templateUtil.mergeJSON(
+      await mergeJSON(
         path.join(this.projectPath, 'xs-security.json'),
         path.join(__dirname, 'files', 'xs-security.json.hbs'),
         projectDescriptor,
@@ -125,9 +132,9 @@ module.exports = class MultitenancyTemplate extends TemplateBase {
       )
     }
 
-    if (hasXsuaa && hasHelmDeployment) {
+    if (hasXsuaa && hasHelm) {
       // REVISIT: Shared xs-security.json location for Helm and MTA?
-      await fs.copy(
+      await copy(
         path.join(this.projectPath, 'xs-security.json'),
         path.join(this.projectPath, 'chart', 'xs-security.json')
       )

package/lib/init/template/nodejs/index.js

@@ -1,15 +1,20 @@
 const path = require('path');
+const { mkdirp } = require('../../../cds').utils
+const { COMMAND_ADD, OPTION_JAVA, OPTION_NODEJS, URLS } = require('../../constants')
+const { copyFiles } = require('../../util/templateUtil')
+const LOG = console
 
-const TemplateBase = require('../templateBase');
-const { COMMAND_ADD, OPTION_JAVA, OPTION_NODEJS, URLS } = require('../../constants');
-
-
-module.exports = class NodeJSTemplate extends TemplateBase {
+module.exports = class NodeJSTemplate extends require('../templateBase') {
     constructor(projectPath, generator) {
         super(projectPath, generator, __dirname);
     }
 
-    async checkEnabled() { //NOSONAR
+    static hasFacet() {
+        // TODO: Implement
+        //return this.pLanguage === P_LANGUAGE_NODEJS
+    }
+
+    async canRun() {
         if (this.options._cmd === COMMAND_ADD) {
             throw new Error(`You can't change the type of an existing project.`);
         }
@@ -27,27 +32,20 @@ module.exports = class NodeJSTemplate extends TemplateBase {
         const values = {
             projectName: this.projectName
         }
-        await this.templateUtil.copyFiles('.', this.projectPath, values, this.options.force);
-
-        const dbFolderPath = path.join(this.projectPath, env.folders.db);
-        await this.fsUtil.mkdirp(dbFolderPath);
-
-        const srvFolderPath = path.join(this.projectPath, env.folders.srv);
-        await this.fsUtil.mkdirp(srvFolderPath);
-
-        const appFolderPath = path.join(this.projectPath, env.folders.app);
-        await this.fsUtil.mkdirp(appFolderPath);
+        await copyFiles(path.join(__dirname, 'files'), this.projectPath, values, this.options.force)
 
-        // used to call npm install here
+        await mkdirp(this.projectPath, env.folders.db);
+        await mkdirp(this.projectPath, env.folders.srv);
+        await mkdirp(this.projectPath, env.folders.app);
     }
 
     async finalize() {
         const relativeProjectPath = path.relative(this.cwd, this.projectPath);
         if (relativeProjectPath && relativeProjectPath !== '.') {
-            this.logger.log(`Continue with 'cd ${relativeProjectPath}'`);
+            LOG.info(`Continue with 'cd ${relativeProjectPath}'`);
         }
 
-        this.logger.log(`Find samples on ${URLS.SAMPLES}`);
-        this.logger.log(`Learn about next steps at ${URLS.CAPIRE}`);
+        LOG.info(`Find samples on ${URLS.SAMPLES}`);
+        LOG.info(`Learn about next steps at ${URLS.CAPIRE}`);
     }
 }

package/lib/init/template/notebook/index.js

@@ -1,442 +1,13 @@
-const TemplateBase = require('../templateBase');
-
-const os = require('os');
-const path = require('path');
-const axios = require('axios');
-const cp = require('child_process');
-
-const commandUtil = require('../../util/commandUtil');
 const term = require('../../../util/term');
-const Notebook = require('./notebook');
-
-const { URLS } = require('../../constants');
-const { IS_MAC, IS_WIN, PYTHON_VENV_NAME } = require('../../constants');
-
-const nbType = 'default';
-const nbRequired = [];
-const nbTypes = {
-    'default': ['/docs/get-started/in-a-nutshell'],
-    'mta': [
-        '/docs/guides/databases#configure-hana',
-        '/docs/advanced/deploy-to-cloud'
-    ],
-    'mtx': ['/docs/guides/multitenancy#nodejs-stack']
-}
-
-const REGEX_REDIRECT = /<meta\s+http-equiv\s*=\s*"refresh"\s+content\s*=\s*".*\s+url\s*=\s*(.*)\s*"/i;
 
-module.exports = class NotebookTemplate extends TemplateBase {
+module.exports = class NotebookTemplate extends require('../templateBase') {
     constructor(projectPath, generator) {
         super(projectPath, generator, __dirname);
-        this.pythonCmd = null;
-        this.pythonPckCmd = null;
-        this.pythonPath = '';
-        this.pythonPackages = '';
-        this.pythonPathLib = '';
-        this.hasVscode = false;
-        this.hasJupyterlab = false;
-        this.validPythonVenv = false;
-        this.binPythonVenv = 'bin';
-        this.libPythonVenv = 'lib';
-        this.notebookEnv = '';
-        this.notebookExtensions = '';
-        this.hasNotebookExtension = false;
-        this.scrapedCapire = {};
-        this.nb_json = null;
-        this.missingDependencies = [];
-        this.logOutput = '';
-    }
-
-    async _collectMatchingCmds(matches) {
-        let allCmds = '';
-        for (const match of matches) {
-            if (IS_WIN) {
-                const matchReceived = await this._tryCatchReturn({
-                    error: null,
-                    cmd: `where`,
-                    args: [`${match}*`]
-                })
-                if (matchReceived) {
-                    allCmds += matchReceived;
-                }
-            } else {
-                let compgenCmd = `compgen -c ${match}`;
-                if (IS_MAC) {
-                    compgenCmd = `compgen -ac | grep ${match}`
-                }
-                const matchReceived = await this._tryCatchReturn({
-                    error: null,
-                    cmd: '/bin/bash',
-                    args: ['-c', `${compgenCmd}`]
-                })
-                if (matchReceived) {
-                    allCmds += matchReceived;
-                }
-            }
-        }
-        const cmds = [];
-        for (const cmd of allCmds.split('\n')) {
-            cmds.push(path.basename(cmd.trim()))
-        }
-        return cmds
-    }
-
-    async _pythonCmdCheck() {
-        const pythonAliases = await this._collectMatchingCmds(['python']);
-        for (const pythonAlias of pythonAliases) {
-            try {
-                let pythonVersion = await commandUtil.spawnCommand(pythonAlias, ['--version'], {
-                    cwd: this.projectPath
-                }, undefined, true);
-                pythonVersion = pythonVersion.replace('Python ', '');
-                if (parseFloat(pythonVersion) >= parseFloat('3.8.5')) {
-                    this.pythonCmd = pythonAlias;
-                    break;
-                }
-            } catch (err) {
-                // Do nothing
-            }
-        }
-        if (this.pythonCmd === null) {
-            this.missingDependencies.push('Python (>=v3.8.5):\n' +
-                term.warn(`  ${URLS.PYTHON}\n`));
-            if (!IS_WIN) {
-                this.logger.log(`When using the configure script, you must add ${term.bold('--with-ensurepip=install')}`)
-            }
-        }
-    }
-
-    async _pythonPckCmdCheck() {
-        const pipAliases = await this._collectMatchingCmds(['pip', 'conda']);
-        for (const pipAlias of pipAliases) {
-            try {
-                await commandUtil.spawnCommand(pipAlias, ['--version'], {
-                    cwd: this.projectPath
-                }, undefined);
-                this.pythonPckCmd = pipAlias;
-                break;
-            } catch (err) {
-                // Do nothing
-            }
-        }
-        if (this.pythonPckCmd === null) {
-            try {
-                await commandUtil.spawnCommand('conda', ['info'], {
-                    cwd: this.projectPath
-                }, undefined, true);
-                this.pythonPckCmd = 'conda';
-            } catch (err) {
-                this.missingDependencies.push(
-                    'Python package manager:\n' +
-                    term.warn(`  ${URLS.PYTHON_PIP}`)
-                );
-            }
-        }
-    }
-
-    async _pythonPcksCheck() {
-        const argPckCmd = 'list';
-        if (this.pythonPckCmd !== null) {
-            try {
-                if (!this.pythonPackages) {
-                    this.pythonPackages = await commandUtil.spawnCommand(this.pythonPckCmd, [argPckCmd], {
-                        cwd: this.projectPath
-                    }, undefined, true);
-                }
-            } catch (err) {
-                // Do nothing
-            }
-        }
-        if (this.pythonPackages.includes('jupyterlab')) {
-            this.hasJupyterlab = true;
-        }
-    }
-
-    async _notebookViewerCheck() {
-        try {
-            await commandUtil.spawnCommand('code', ['--version'], {
-                cwd: this.projectPath
-            });
-            this.hasVscode = true;
-        } catch (err) {
-            this.logger.log(`Consider installing vscode: ${URLS.VSCODE}`)
-        }
-        if (this.hasVscode) {
-            this.notebookExtensions = await commandUtil.spawnCommand('code',
-                ['--list-extensions', '--category', 'notebooks'], {
-                cwd: this.projectPath
-            }, undefined, true);
-            if (this.notebookExtensions && this.notebookExtensions.includes('ms-python.python')) {
-                this.hasNotebookExtension = true;
-            }
-            if (!this.hasNotebookExtension) {
-                this.missingDependencies.push('No notebook viewer found!\n' +
-                    term.info(`Consider installing the VS Code Python extension:\n
-                         'ms-python.python': ${URLS.VSCODE_NBVIEWER}\n`));
-            }
-        }
-    }
-
-    _getNotebookEnv() {
-        this.notebookEnv = path.join(os.homedir(), PYTHON_VENV_NAME);
-        let cmd;
-        if (IS_WIN) {
-            cmd = 'where';
-        } else {
-            cmd = 'which';
-        }
-        this.pythonPath = cp.execSync(`${cmd} ${this.pythonCmd}`).toString();
-    }
-
-    async _tryCatch(task) {
-        try {
-            await commandUtil.spawnCommand(
-                task.cmd,
-                task.args, {
-                cwd: this.projectPath
-            }, undefined, true);
-        } catch (err) {
-            if (task.error) {
-                throw new Error(task.error);
-            }
-        }
-    }
-
-    async _tryCatchReturn(task) {
-        try {
-            const result = await commandUtil.spawnCommand(
-                task.cmd,
-                task.args, {
-                cwd: this.projectPath
-            }, undefined, true);
-            return result;
-        } catch (err) {
-            if (task.error) {
-                throw new Error(task.error);
-            }
-        }
-    }
-
-    async _createPythonVenv(pythonPackagesReq) {
-        await this._tryCatch({
-            error: "Failed to initialize virtualenv.\n" +
-                "If you get the error [ ... 'ensurepip', '--upgrade', '--default-pip']', please install ensurepip via:\n" +
-                `${term.bold('sudo apt-get install ' + this.pythonCmd + '-venv')}`,
-            cmd: `${this.pythonCmd}`,
-            args: ['-m', 'venv', `${this.notebookEnv}`]
-        })
-        if (IS_WIN) {
-            await this._tryCatch({
-                error: "Failed to prepare virtualenv",
-                cmd: `"${path.join(this.notebookEnv, this.binPythonVenv, 'activate')} && ` +
-                    `pip install ${pythonPackagesReq.join(' ')} && ` +
-                    `${path.join(this.notebookEnv, this.binPythonVenv, 'ipython')} kernel install --user --name=${PYTHON_VENV_NAME} && ` +
-                    `deactivate"`,
-                args: []
-            })
-        } else {
-            await this._tryCatch({
-                error: "Failed to prepare virtualenv",
-                cmd: '/bin/sh',
-                args: ['-c', `. ${path.join(this.notebookEnv, this.binPythonVenv, 'activate')}
-                pip install ${pythonPackagesReq.join(' ')}
-                ${path.join(this.notebookEnv, this.binPythonVenv, 'ipython')} kernel install --user --name=${PYTHON_VENV_NAME}
-                deactivate`]
-            })
-        }
     }
 
-    async _checkPythonVenv(pythonPackagesReq) {
-        // Check if venv exists
-        const pythonVenvPath = await this.fsUtil.pathExists(this.notebookEnv);
-        if (pythonVenvPath) {
-            if (IS_WIN) {
-                this.pythonPathLib = path.join(this.notebookEnv, this.libPythonVenv, 'site-packages');
-            } else {
-                this.pythonPathLib = path.join(this.notebookEnv, this.libPythonVenv, 'python*', 'site-packages');
-            }
-            // Check if required packages exist
-            for (const pck of pythonPackagesReq) {
-                const pckExists = await this.fsUtil.pathExists(this.pythonPathLib, pck);
-                if (!pckExists) {
-                    return false;
-                }
-            }
-            // Check if required scripts exist
-            let pythonScriptsReq;
-            if (IS_WIN) {
-                pythonScriptsReq = ['python.exe', 'ipython.exe', 'jupyter-kernel.exe'];
-            } else {
-                pythonScriptsReq = ['python', 'ipython', 'jupyter-kernel'];
-            }
-            for (const pck of pythonScriptsReq) {
-                const pckExists = await this.fsUtil.pathExists(this.pythonPathLib, pck);
-                if (!pckExists) {
-                    return false;
-                }
-            }
-        } else {
-            return false
-        }
-        return true;
-    }
-
-    async _url2Html(contentUrl) {
-        const response = await axios.get(contentUrl, {
-            headers: {
-                'Access-Control-Allow-Origin': '*'
-            }, 'timeout': 20000
-        });
-        const match = REGEX_REDIRECT.exec(response.data);
-        if (match && match[1]) {
-            const newContentUrl = new URL(contentUrl);
-            const newUrl = new URL(match[1], newContentUrl.origin);
-            this._url2Html(newUrl)
-        } else {
-            return response.data;
-        }
-    }
-
-    async _collectHtmlPages(nbReq) {
-        if (!this.scrapedCapire[nbReq]) {
-            let pageCollection = '';
-            for (let p = 0; p < nbTypes[nbReq].length; p++) {
-                const page = nbTypes[nbReq][p];
-                try {
-                    const html = await this._url2Html(URLS.CAPIRE + page);
-                    if (!pageCollection) {
-                        pageCollection = html;
-                    } else {
-                        pageCollection += html;
-                    }
-                } catch (err) {
-                    // Do nothing
-                }
-            }
-            this.scrapedCapire[nbReq] = pageCollection;
-        }
-    }
-
-    async _notebookInit(projectName) {
-        // Create new notebook, overwrite if already exists
-        await this.templateUtil.copyFiles('.', this.projectPath, { name: projectName, cap: URLS.CAPIRE }, true);
-        this.nb_json = path.resolve('.', this.projectPath, `${projectName}.ipynb`);
-        const exists = await this.fsUtil.pathExists(this.nb_json);
-        const nb = exists ? await this.fsUtil.readJSON(this.nb_json) : {};
-        return nb;
-    }
-
-    async _notebookWriteFromComponents(type) {
-        if (type === 'mta') {
-            nbRequired.push('default')
-        } else if (type === 'mtx') {
-            nbRequired.push('default')
-            nbRequired.push('mta')
-        }
-        nbRequired.push(type)
-
-        for (let n = 0; n < nbRequired.length; n++) {
-            const nbReq = nbRequired[n];
-
-            // Get notebook name
-            let projectName = `${this.projectName}`
-            if (nbReq !== 'default') {
-                projectName = `${this.projectName}-${nbReq}`
-            }
-            await this._collectHtmlPages(nbReq);
-            const nb = await this._notebookInit(projectName);
-
-            // Add cap magic
-            const stringPython = await this.fsUtil.readFile(path.join(__dirname, 'cap_magic.py'), 'UTF-8');
-            nb['metadata']['cap_magic'] = stringPython;
-
-            // Generate notebook
-            this.logger.debug(`  writing ${type} notebook...`)
-            const notebook = new Notebook({ name: projectName, nb: nb, html: this.scrapedCapire[nbReq], url: URLS.CAPIRE, route: nbTypes[nbReq][0] });
-            await this.fsUtil.writeJSON(this.nb_json, notebook.nb);
-        }
-    }
-
-    async checkEnabled() {
-        this.logger.warn('There is a new generation of notebooks. Find out more about the new VS Code based CAP Notebooks on https://cap.cloud.sap/docs/releases/jun22#vs-code-cap-notebooks.');
-        this.logger.log();
-        return true;
-    }
-
-    async run() {
-
-        // REQUIRED: Python [python or python3]
-        if (!this.pythonCmd) {
-            await this._pythonCmdCheck()
-        }
-
-        // REQUIRED: Python package manager
-        if (!this.pythonPckCmd) {
-            await this._pythonPckCmdCheck()
-        }
-
-        // OPTIONAL: JupyterLab viewer in python packages
-        if (!this.hasJupyterlab) {
-            await this._pythonPcksCheck()
-        }
-
-        // OPTIONAL: Jupyter Notebook viewer in VS Code extensions
-        if (!this.hasVscode && !this.hasNotebookExtension) {
-            await this._notebookViewerCheck()
-        }
-
-        // If missing dependencies, throw error
-        if (this.missingDependencies.length > 0) {
-            let error = '\nYou are missing ' + this.missingDependencies.length + ' notebook dependencies!\n' +
-                'Please install the following components (in order!) and rerun your cds command:\n\n'
-            for (let i = 0; i < this.missingDependencies.length; i++) {
-                error += '(' + (i + 1) + ') ' + this.missingDependencies[i] + '\n';
-            }
-            throw new Error(error);
-        } else {
-            if (IS_WIN) {
-                this.binPythonVenv = 'Scripts';
-                this.libPythonVenv = 'Lib';
-            }
-            if (!this.pythonPath) {
-                this._getNotebookEnv();
-            }
-            // If not exists, install virtualenv with required packages
-            const pythonPackagesReq = ['ipykernel', 'notebook'];
-            if (!this.validPythonVenv) {
-                this.validPythonVenv = await this._checkPythonVenv(pythonPackagesReq);
-                if (!this.validPythonVenv) {
-                    await this._createPythonVenv(pythonPackagesReq);
-                }
-            }
-            // Generate notebook from components
-            await this._notebookWriteFromComponents(nbType);
-        }
-    }
-
-    async finalize() {
-        this.logOutput = [' '];
-        if (this.hasVscode && this.hasNotebookExtension) {
-            this.logOutput.push(`To view the notebook in VS Code:`);
-            this.logOutput.push(`\t1. ${term.info('Ctrl + Click')} the following link: ${term.info(`${this.nb_json}`)}`);
-            this.logOutput.push(`\t2. Make sure to ${term.info('Trust')} the notebook in the popup window to enable markdown and code execution`);
-            this.logOutput.push(`\t3. Run the notebook`);
-            this.logOutput.push('');
-        }
-        if (this.pythonPackages.includes('notebook') && this.hasJupyterlab) {
-            this.logOutput.push(`To view the notebook in JupyterLab:`);
-            this.logOutput.push(`\t1. Open with JupyterLab: ${term.info(`python -m jupyterlab ${path.relative(process.cwd(), this.nb_json)}`)}`);
-            this.logOutput.push(`\t2. Run the notebook`);
-            this.logOutput.push('');
-        }
-        this.logOutput.push(`To view the notebook in your browser:`);
-        this.logOutput.push(`\t1. Open with Jupyter: ${term.info(path.join(this.notebookEnv, this.binPythonVenv, 'jupyter') +
-            ' notebook ' + path.relative(process.cwd(), this.nb_json))}`);
-        this.logOutput.push(`\t2. Run the notebook`);
-        this.logOutput.push('');
-
-        for (const line of this.logOutput) {
-            this.logger.log(line);
-        }
+    async canRun() {
+        console.log(term.warn('CAP Jupyter Notebooks have been replaced by Custom CAP Notebooks for VS Code!'));
+        console.log(`They are now part of the CDS Editor: ${term.info('https://cap.cloud.sap/docs/tools/#add-cds-editor')}`);
+        return false;
     }
 }

package/lib/init/template/pipeline/index.js

@@ -1,21 +1,21 @@
 const path = require('path');
+const { exists } = require('../../../cds').utils
+const { copyFiles } = require('../../util/templateUtil')
+const { URLS } = require('../../constants')
+const LOG = console
 
-const TemplateBase = require('../templateBase');
-const { URLS } = require('../../constants');
-
-
-module.exports = class PipelineTemplate extends TemplateBase {
+module.exports = class PipelineTemplate extends require('../templateBase') {
     constructor(projectPath, generator) {
         super(projectPath, generator, __dirname);
     }
 
-    async checkEnabled() {
+    async canRun() {
         if (this.options.force) {
             return true;
         }
 
-        if (await this.fsUtil.pathExists(path.join(this.projectPath, 'Jenkinsfile')) ||
-            await this.fsUtil.pathExists(path.join(this.projectPath, '.pipeline/config.yml'))) {
+        if (exists(path.join(this.projectPath, 'Jenkinsfile')) ||
+            exists(path.join(this.projectPath, '.pipeline/config.yml'))) {
             throw new Error(`Pipeline support file exists. Use --force to overwrite.`);
         }
 
@@ -23,10 +23,10 @@ module.exports = class PipelineTemplate extends TemplateBase {
     }
 
     async run() {
-        await this.templateUtil.copyFiles('.', this.projectPath, {}, this.options.force);
+        await copyFiles(path.join(__dirname, 'files'), this.projectPath, {}, this.options.force);
     }
 
     async finalize() {
-        this.logger.log(`For information on project "Piper" and its pipelines see ${URLS.PIPELINE_HELP}`);
+        LOG.info(`For information on project "Piper" and its pipelines see ${URLS.PIPELINE_HELP}`);
     }
 }