@cocreate/cli 1.14.30 → 1.16.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [1.16.0](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.15.0...v1.16.0) (2023-02-21)
+
+
+### Features
+
+* run symlink on coc install ([c4bdf15](https://github.com/CoCreate-app/CoCreate-cli/commit/c4bdf15d7b7f6c6cbe90a68904ca6042f2d6db38))
+
+# [1.15.0](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.14.30...v1.15.0) (2023-02-18)
+
+
+### Features
+
+* auto detects your chosen package manager, Currently supports npm and yarn ([c3349b3](https://github.com/CoCreate-app/CoCreate-cli/commit/c3349b3f3448ff27a1efd98e3b6d3eb14b09aced))
+
 ## [1.14.30](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.14.29...v1.14.30) (2023-02-02)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/cli",
-  "version": "1.14.30",
+  "version": "1.16.0",
   "description": "Polyrepo management bash CLI tool. Run all git commands and yarn commands on multiple repositories. Also includes a few custom macros for cloning, installing, etc.",
   "keywords": [
     "cli",
@@ -77,7 +77,6 @@
     "colors": "latest",
     "glob": "^7.1.7",
     "got": "latest",
-    "minimist": "latest",
     "prettier": "^2.3.2",
     "prompt": "^1.2.0"
   }

package/repositories.js

@@ -87,7 +87,7 @@ module.exports = [
         'repo': 'github.com/CoCreate-app/CoCreate-elements.git'
     },
     {
-        'path': '../CoCreate-components/CoCreate-events',
+        'path': '/home/ubuntu/CoCreateServer/CoCreate-components/CoCreate-events',
         'repo': 'github.com/CoCreate-app/CoCreate-events.git'
     },
     {
@@ -214,10 +214,6 @@ module.exports = [
         'path': '/home/ubuntu/CoCreateServer/CoCreate-components/CoCreate-select',
         'repo': 'github.com/CoCreate-app/CoCreate-select.git'
     },
-    {
-        'path': '/home/ubuntu/CoCreateServer/CoCreate-components/CoCreate-selected',
-        'repo': 'github.com/CoCreate-app/CoCreate-selected.git'
-    },
     {
         'path': '/home/ubuntu/CoCreateServer/CoCreate-components/CoCreate-selection',
         'repo': 'github.com/CoCreate-app/CoCreate-selection.git'
@@ -238,10 +234,6 @@ module.exports = [
         'path': '/home/ubuntu/CoCreateServer/CoCreate-components/CoCreate-text',
         'repo': 'github.com/CoCreate-app/CoCreate-text.git'
     },
-    // {
-    //     'path': '/home/ubuntu/CoCreateServer/CoCreate-components/CoCreate-toggle',
-    //     'repo': 'github.com/CoCreate-app/CoCreate-toggle.git'
-    // },
     {
         'path': '/home/ubuntu/CoCreateServer/CoCreate-components/CoCreate-toolbar',
         'repo': 'github.com/CoCreate-app/CoCreate-toolbar.git'
@@ -350,10 +342,6 @@ module.exports = [
         'path': '/home/ubuntu/CoCreateServer/CoCreate-plugins/CoCreate-linkedin',
         'repo': 'github.com/CoCreate-app/CoCreate-linkedin.git'
     },
-    // {
-    //     'path': '/home/ubuntu/CoCreateServer/CoCreate-plugins/CoCreate-monaco',
-    //     'repo': 'github.com/CoCreate-app/CoCreate-monaco.git'
-    // },
     {
         'path': '/home/ubuntu/CoCreateServer/CoCreate-plugins/CoCreate-pickr',
         'repo': 'github.com/CoCreate-app/CoCreate-pickr.git'
@@ -370,10 +358,6 @@ module.exports = [
         'path': '/home/ubuntu/CoCreateServer/CoCreate-plugins/CoCreate-prism',
         'repo': 'github.com/CoCreate-app/CoCreate-prism.git'
     },
-    // {
-    //     'path': '/home/ubuntu/CoCreateServer/CoCreate-plugins/CoCreate-quill',
-    //     'repo': 'github.com/CoCreate-app/CoCreate-quill.git'
-    // },
     {
         'path': '/home/ubuntu/CoCreateServer/CoCreate-plugins/CoCreate-s3',
         'repo': 'github.com/CoCreate-app/CoCreate-s3.git'
@@ -409,14 +393,14 @@ module.exports = [
 
 
 
-    // {
-    //     'path': '/home/ubuntu/CoCreateServer/CoCreateWS',
-    //     'repo': 'github.com/CoCreate-app/CoCreateWS.git'
-    // },
-    // {
-    //     'path': '/home/ubuntu/CoCreateServer/CoCreateApi',
-    //     'repo': 'github.com/CoCreate-app/CoCreateApi.git'
-    // },
+    {
+        'path': '/home/ubuntu/CoCreateServer/CoCreateWS',
+        'repo': 'github.com/CoCreate-app/CoCreateWS.git'
+    },
+    {
+        'path': '/home/ubuntu/CoCreateServer/CoCreateApi',
+        'repo': 'github.com/CoCreate-app/CoCreateApi.git'
+    },
     
     {
         'path': '/home/ubuntu/CoCreateServer/CoCreateLB',
@@ -479,14 +463,6 @@ module.exports = [
         'path': '/home/ubuntu/CoCreateServer/CoCreate-components/CoCreate-keepalived',
         'repo': 'github.com/CoCreate-app/CoCreate-keepalived.git'
     },
-    // {
-    //     'path': '/home/ubuntu/CoCreateServer/CoCreate-components/CoCreate-mongodb',
-    //     'repo': 'github.com/CoCreate-app/CoCreate-mongodb.git'
-    // },
-    // {
-    //     'path': '/home/ubuntu/CoCreateServer/CoCreate-components/CoCreate-openebs',
-    //     'repo': 'github.com/CoCreate-app/CoCreate-openebs.git'
-    // },
     {
         'path': '/home/ubuntu/CoCreateServer/CoCreate-components/CoCreate-ide',
         'repo': 'github.com/CoCreate-app/CoCreate-ide.git'

package/src/addMeta.js

@@ -1,60 +1,65 @@
 const fs = require('fs')
 const path = require("path")
+const util = require('node:util');
+const exec = util.promisify(require('node:child_process').exec);
+
+module.exports = async function addMeta(repos, failed, directory) {
+    let packageManager;
+    for (let i = 0; i < repos.length; i++) {
+        repos[i].name = path.basename(repos[i].path);
+        repos[i].plainName = repos[i].name.substr(9);
+
+        if (directory) {
+            repos[i].ppath = path.resolve(directory, repos[i].path);
+            repos[i].absolutePath = path.resolve(directory, repos[i].path);
+            repos[i].directory = directory;        
+        }
 
-module.exports = function addMeta(repos, failed) {
-    return repos.map(repo => {
-        let {
-            name,
-            ppath
-        } = repo;
-
-
-
-        let packagejson = path.resolve(ppath, 'package.json');
+        let packagejson = path.resolve(repos[i].absolutePath, 'package.json');
         if (!fs.existsSync(packagejson)) {
-            console.error('package json not found for', name);
+            console.error('package json not found for', repos[i].name);
             failed.push({
-                name,
+                name: repos[i].name,
                 des: 'package json not found'
             })
-            return false;
         }
+
         let packageObj
         try {
             packageObj = require(packagejson);
-
         }
         catch (err) {
-            console.error(err.message)
-            return false;
+            console.error('packageObj', err.message)
         }
 
 
-        let packageName = name.startsWith('cocreate-') ?
-            '@cocreate/' + name.substr(9) : packageObj.name;
+        repos[i].packageName = packageObj.name;
 
-        let deps = Object.keys(packageObj['dependencies'] || {})
+        repos[i].deps = Object.keys(packageObj['dependencies'] || {})
             .filter(packageName => packageName.startsWith('@cocreate/'));
-        let devDeps = Object.keys(packageObj['devDependencies'] || {})
+        repos[i].devDeps = Object.keys(packageObj['devDependencies'] || {})
             .filter(packageName => packageName.startsWith('@cocreate/'));
-
-        // let nodeModulePath = path.resolve(ppath, './node_modules/@cocreate');
-
-        // let deps  = fs.existsSync(nodeModulePath) ?
-        // fs.readdirSync(nodeModulePath).map(name => '@cocreate/' + name):
-        // [];
-
-        return { ...repo,
-            name,
-            packageName,
-            ppath,
-            deps,
-            devDeps
-
+        
+        if (!repos[i].packageManager) {
+            if (packageManager)
+                repos[i].packageManager = packageManager
+            else {
+                repos[i].packageManager = 'npm'
+                let lockFile = path.resolve(repos[i].absolutePath, 'package-lock.json');
+                if (!fs.existsSync(lockFile)) {
+                    lockFile = path.resolve(repos[i].absolutePath, 'yarn.lock');
+                    if (fs.existsSync(lockFile))
+                        repos[i].packageManager = 'yarn'
+                    else {
+                        const { error } = await exec('yarn --version');
+                        if (!error)
+                            repos[i].packageManager = 'yarn'
+                    }
+                    packageManager = repos[i].packageManager
+                }
+            }
         }
+    }
 
-
-
-    })
-
+    return repos
 } 

package/src/coc.js

@@ -1,32 +1,30 @@
 #!/usr/bin/env node
-
-const minimist = require('minimist');
-
 const path = require("path");
 const fs = require("fs");
 const execute = require('./execute');
 const argv = process.argv.slice(2);
-console.log('bumper')
+const addMeta = require('./addMeta');
+
 
 if (argv.length < 1) {
     console.error("enter some command to do something");
     process.exit(1);
 }
+let repos, command, config = {};
+
+const options = ['-self']
+for (let option of options) {
+    if (argv.includes(option)) {
+        config.self = true
+        const index = argv.indexOf(option);
+        delete argv[index];
+    }
+}
 
-
-let config = minimist(argv, {
-    alias: { config: 'c', absolutePath: 'cf', hideMessage: 'h' },
-    stopEarly: true
-});
-
-
-let repos, command;
-
-command = config['_']
+command = argv
     .map((part) => part.match(/ |'|"/) ? `'${part.replace(/'/,'\\\'')}'` : part)
     .join(" ");
 
-
 function getRepositories(path) {
     try {
         return require(path);
@@ -38,23 +36,18 @@ function getRepositories(path) {
 }
 
 const currentRepoPath = path.resolve(process.cwd(), "./repositories.js");
-// let cliRepoPath = path.resolve(__dirname, '..', 'repositories.js');
 let packageJsonPath = path.resolve(process.cwd(), './package.json');
-let repoDir, doAllRepo;
+let directory
 
-if (fs.existsSync(config['c'])) {
+if (config['c'] && fs.existsSync(config['c'])) {
     repos = getRepositories(config['c']);
-        repoDir = path.dirname(config['c']);
-        doAllRepo = false;
-      console.warn(`using ${config['c']} configuration`.yellow);
-}
-else if (fs.existsSync(currentRepoPath)) {
+    directory = path.dirname(config['c']);
+    console.warn(`using ${config['c']} configuration`.yellow);
+} else if (!config['self'] && fs.existsSync(currentRepoPath)) {
     repos = getRepositories(currentRepoPath);
-    repoDir = path.dirname(currentRepoPath);
-    doAllRepo = true;
+    directory = path.dirname(currentRepoPath);
     console.warn(`using ${currentRepoPath} configuration`.yellow);
-}
-else if (fs.existsSync(packageJsonPath)) {
+} else if (fs.existsSync(packageJsonPath)) {
     let repoPath = path.resolve(process.cwd());
     let packageObj = require(packageJsonPath);
     let repoUrl = packageObj.repository.url.substr(12);
@@ -62,53 +55,18 @@ else if (fs.existsSync(packageJsonPath)) {
         path: `${repoPath}`,
         repo: `${repoUrl}`
     }];
-    repoDir = path.dirname(packageJsonPath);
-    doAllRepo = false;
+    directory = path.dirname(packageJsonPath);
     console.warn(`using ${packageJsonPath} configuration`.yellow);
-}
-// else if (fs.existsSync(cliRepoPath)) {
-  
-//     repos = getRepositories(cliRepoPath)
-//         repoDir = path.dirname(cliRepoPath);
-//         doAllRepo = false;
-//       console.warn(`using ${cliRepoPath} configuration`.yellow)
-
-// }
-else {
+} else {
     console.error(`a configuration file can not be found`.red);
     process.exit(1);
 }
-config = {hideMessage: false, ...config, repoDir, doAllRepo };
-
-let repoFullMeta = repos.map(meta => {
-    let name = path.basename(meta.path).toLowerCase();
-    let plainName = name.substr(9);
-    let ppath = path.resolve(repoDir, meta.path);
-    try {
-        if (!fs.existsSync(ppath))
-            console.error(`${ppath} not found`.red);
-
-        return { ...meta, name, ppath, plainName };
-    }
-    catch (err) {
-        console.error(name.red, err.message.red, ppath);
-        // process.exit(1)
-    }
-
-});
+config = {hideMessage: false, ...config };
 
 (async() => {
-    if (command == 'bump'){
-        console.log('bumping')
-        let predefined = path.resolve(__dirname, 'commands', command + '.js');
-        require(predefined)(repos, repos )
-    }
-    if (command == 'gitConfig'){
-        let predefined = path.resolve(__dirname, 'commands', command + '.js');
-        require(predefined)(repos, repos )
-    }
-    else {
-        let failed = await execute(command, repoFullMeta, config);
+    repos = await addMeta(repos, [], directory)
+    let failed = await execute(command, repos, config);
+    if (failed) {
         if (failed.length === 0)
             process.exit(0);
         else {
@@ -118,5 +76,4 @@ let repoFullMeta = repos.map(meta => {
 
         }
     }
-    // console.log(`success: ${report.success}`.green, `failed: ${report.fail}`.red);
 })();

package/src/commands/bump.js

@@ -1,126 +1,85 @@
-
 let fs = require('fs');
-const prettier = require("prettier");
-let list = require('../../../repositories.js');
 const path = require("path")
-
-const spawn = require('../spawn');
 const colors = require('colors');
-const addMeta = require('../addMeta');
-
-let pathList = list.map(o => o.path)
-let nameList = pathList.map(fn => path.basename(fn).toLowerCase());
-console.log('pathList', pathList)
-console.log('pathList', nameList)
-let item = {}
-
-// ToDo: excute using command coc bump. when executed it will check for a repository.js file. same as other commands/
-// (async() => {
-
-//     for (let [index, name] of nameList.entries()) {
-//         getVersions(pathList[index] + '/package.json', name).
-//     }
-//     // console.log('bump versions', item)
-//     // for (let [index, name] of nameList.entries()) {
-//     //     await bumpVersion(pathList[index] + '/package.json', name)
-//     // }
-
-
-// })();
-
-// module.exports = async function run() {
-//     try {
-//         for (let [index, name] of nameList.entries()) {
-//             getVersions(pathList[index] + '/package.json', `@${name}`)
-//          }
-//          console.log('bump versions', item)
-     
-//          for (let [index, name] of nameList.entries()) {
-//              await bumpVersion(pathList[index] + '/package.json', name)
-//          }
-//     } catch (err) {
-//         failed.push({ name: 'GENERAL', des: err.message })
-//     }
-
-//     console.log('completed')
-//     return failed
-//     // process.exit()  
-// }
-
-
-async function run() {
-//     let failed = [];
-
-//     try {
-//         repos = addMeta(repos, failed)
-
-//     }
-//     catch (err) {
-//         failed.push({
-//             name: 'GENERAL',
-//             des: err.message
-//         })
+const util = require('node:util');
+const exec = util.promisify(require('node:child_process').exec);
+
+
+let pathList, nameList, item = {}, failed = [];
+
+module.exports = async function bump(repos) {
+    pathList = repos.map(o => o.path)
+    if (repos.length === 1) {
+        let packageJsonPath = path.resolve(process.cwd(), './package.json');
+
+        if (fs.existsSync(packageJsonPath)) {
+            let object = require(packageJsonPath)
+            if (object.dependencies) {
+                for (let key of Object.keys(object.dependencies)) {
+                    if (key.startsWith("@cocreate/")) {
+                        const version = await exec(`npm view ${key} version`);
+                        item[key] = `^${version.stdout}`.trim()
+                    }
+                }
+                console.log('bump versions', item)
+
+                for (let name of Object.keys(item)) {
+                    bumpVersion(packageJsonPath, name)
+                }
+            }
+        }
 
-//     }
+    } else {
+        nameList = pathList.map(fn => path.basename(fn).toLowerCase());
 
-//     // console.log(repos)
-//     // return [];
-//     for (let repo of repos) {
-//         await reAdd(repo.deps, repo, failed, '')
-//         await reAdd(repo.devDeps, repo, failed, '-D ')
-//     }
-//     return failed;
+        for (let [index, name] of nameList.entries()) {
+            getVersions(pathList[index] + '/package.json', `@${name}`)
+        }
 
-// }
+        console.log('bump versions', item)
 
-    for (let [index, name] of nameList.entries()) {
-       getVersions(pathList[index] + '/package.json', `@${name}`)
-    }
-    console.log('bump versions', item)
+        for (let [index, name] of nameList.entries()) {
+            bumpVersion(pathList[index] + '/package.json', name)
+        }
 
-    for (let [index, name] of nameList.entries()) {
-        await bumpVersion(pathList[index] + '/package.json', name)
     }
 
     console.log('completed')
-    // process.exit()  
+    return failed;
 }
 
-function getVersions(path, name) {
-    if (!fs.existsSync(path))
-        return console.error('path doesn\'t exist:', path)
-    let object = require(path)
-    if (object.name && object.version) {
-        item[object.name] = `^${object.version}`
+function getVersions(filePath) {
+    if (fs.existsSync(filePath)) {
+        let object = require(filePath)
+        if (object.name && object.version) {
+            item[object.name] = `^${object.version}`
+        }
+    } else {
+        failed.push({name: 'get version', des: 'path doesn\'t exist:' + filePath})
     }
 }
 
 function bumpVersion(filePath, name) {
-    if (!fs.existsSync(filePath))
-        return console.error('path doesn\'t exist:', path)
     let object = require(filePath)
-    let newObject = {...object}
-
-    if (!object.dependencies)
-        return console.log(name, 'not updated')
-    else {
-        for (const name of Object.keys(object.dependencies)) {
-            if (item[name]) {
-                newObject.dependencies[name] = item[name]
+    if (object) {
+        let newObject = {...object}
+    
+        if (!object.dependencies)
+            return console.log(name, 'not updated')
+        else {
+            for (const name of Object.keys(object.dependencies)) {
+                if (item[name]) {
+                    newObject.dependencies[name] = item[name]
+                }
             }
-        }
-
-        // let str = JSON.stringify(object, null, 2)
-        // let formated = prettier.format(str, { semi: false, parser: "json" });
 
-        filePath = filePath.replace('/package.json', '')
-        let Path = path.resolve(filePath, 'package.json')
-        if (fs.existsSync(Path)){
-            fs.unlinkSync(Path)
+            if (fs.existsSync(filePath)){
+                fs.unlinkSync(filePath)
+            }
+    
+            fs.writeFileSync(filePath, JSON.stringify(object, null, 2))
         }
-
-        fs.writeFileSync(Path, JSON.stringify(object, null, 2))
+    } else {
+        failed.push({name: 'bump version', des: 'path doesn\'t exist:' + filePath})
     }
 }
-
-// run()

package/src/commands/clone.js

@@ -5,22 +5,21 @@ const path = require('path');
 
 module.exports = async function gitClone(repos) {
     const failed = [];
-    for (let meta of repos) {
-
-        let { repo, path: ppath, name } = meta;
-        let usernamePrompt = true;
-
-        let dirPath = path.dirname(ppath);
-        let exitCode = await spawn('mkdir', ['-p', dirPath], { stdio: 'inherit', cwd: process.cwd() })
-        if (exitCode !== 0) {
-            failed.push({ name, des: `creating directory failed` })
-
-        }
-
-        exitCode = await spawn('git', ['clone', `https://${repo}`], { stdio: 'inherit', cwd: dirPath })
-        if (exitCode !== 0) {
-            failed.push({ name, des: `cloning ${name} failed` })
-
+    const cwdPath = path.resolve(process.cwd());
+
+    for (let i = 0; i < repos.length; i++) {
+        if (cwdPath !== repos[i].absolutePath) {
+            let exitCode = await spawn('mkdir', ['-p', repos[i].directory], { stdio: 'inherit', cwd: process.cwd() })
+            if (exitCode !== 0) {
+                failed.push({ name: repos[i].name, des: `creating directory failed` })
+            }
+    
+            exitCode = await spawn('git', ['clone', `https://${repos[i].repo}`], { stdio: 'inherit', cwd: repos[i].directory })
+            if (exitCode !== 0) {
+                failed.push({ name: repos[i].name, des: `cloning failed` })
+    
+            }
+    
         }
     }