@cocreate/cli 1.29.3 → 1.31.0

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+# [1.31.0](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.30.0...v1.31.0) (2023-06-09)
+
+
+### Features
+
+* exposed functions to module.exports ([1a11a4a](https://github.com/CoCreate-app/CoCreate-cli/commit/1a11a4a49041e10b31e4aa9ad358da3da0ec4c01))
+* Refactor configuration loading logic, add prompts for env variables, and allow nested choices ([63c8567](https://github.com/CoCreate-app/CoCreate-cli/commit/63c8567bfb1cd700d1f921685fe7812cb3dc1919))
+
+# [1.30.0](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.29.3...v1.30.0) (2023-06-07)
+
+
+### Features
+
+* Add @cocreate/file dependency, remove @cocreate/docs and prompt from the dependencies section, and refactor code inside the upload.js file. ([8fa20cd](https://github.com/CoCreate-app/CoCreate-cli/commit/8fa20cdbde1ab3e1d4397f41673d0d9b17c4966c))
+* Install "coc" globally if not already installed ([cad848b](https://github.com/CoCreate-app/CoCreate-cli/commit/cad848bfefe2f66fb323eca3eac292d9547e6cc6))
+
 ## [1.29.3](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.29.2...v1.29.3) (2023-06-04)
 
 

package/CoCreate.config.js

@@ -1,9 +1,7 @@
 module.exports = {
-    "config": {
-        "organization_id": "",
-        "key": "",
-        "host": ""
-    },
+    "organization_id": "",
+    "key": "",
+    "host": "",
     "sources": [
         {
             "collection": "files",

package/check-coc.js

@@ -0,0 +1,16 @@
+const { execSync } = require('child_process');
+
+try {
+    // Try to run "coc" command
+    execSync('coc --version', { stdio: 'ignore' });
+    console.log('"coc" is already installed globally.');
+} catch (error) {
+    // If "coc" command does not exist, install it globally
+    console.log('"coc" command not found. Installing globally...');
+    try {
+        execSync('npm install -g coc', { stdio: 'inherit' });
+        console.log('"coc" has been installed globally.');
+    } catch (error) {
+        console.error('Failed to install "coc" globally:', error);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/cli",
-  "version": "1.29.3",
+  "version": "1.31.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",
@@ -37,7 +37,6 @@
     "replace": "nodejs src/commands/replace.js",
     "webpack": "nodejs src/commands/fs/webpack.js",
     "docs": "node ./node_modules/@cocreate/docs/src/index.js",
-    "hosting": "node ./node_modules/@cocreate/hosting/src/index.js",
     "permissions": "chmod +rwx /home/ubuntu/.nvm/versions/node/v19.8.1/bin/coc"
   },
   "repository": {
@@ -54,16 +53,15 @@
     "type": "GitHub Sponsors ❤",
     "url": "https://github.com/sponsors/CoCreate-app"
   },
-  "main": "index.js",
+  "main": "src/commands/index.js",
   "bin": {
     "coc": "src/coc.js"
   },
   "dependencies": {
-    "@cocreate/docs": "^1.7.15",
-    "@cocreate/hosting": "^1.10.8",
+    "@cocreate/docs": "^1.8.2",
+    "@cocreate/file": "^1.0.0",
     "colors": "latest",
     "glob": "^7.1.7",
-    "prettier": "^2.3.2",
-    "prompt": "^1.2.0"
+    "prettier": "^2.3.2"
   }
 }

package/repositories.js

@@ -98,6 +98,10 @@ module.exports = [
         'path': '../CoCreate-fetch',
         'repo': 'github.com/CoCreate-app/CoCreate-fetch.git'
     },
+    {
+        'path': '../CoCreate-file',
+        'repo': 'github.com/CoCreate-app/CoCreate-file.git'
+    },
     {
         'path': '../CoCreate-filter',
         'repo': 'github.com/CoCreate-app/CoCreate-filter.git'

package/src/commands/config.js

@@ -0,0 +1,100 @@
+const readline = require('readline');
+const os = require('os');
+const path = require('path');
+const fs = require('fs');
+
+module.exports = async function CoCreateConfig(items, processEnv = true, updateGlobal = true) {
+    async function promptForInput(question) {
+        const rl = readline.createInterface({
+            input: process.stdin,
+            output: process.stdout
+        });
+
+        return new Promise((resolve) => {
+            rl.question(question, (answer) => {
+                rl.close();
+                resolve(answer.trim());
+            });
+        });
+    }
+
+    const filterEmptyValues = (obj) => {
+        return Object.fromEntries(
+            Object.entries(obj).filter(([_, value]) => {
+                if (typeof value === 'object' && !Array.isArray(value)) {
+                    return Object.keys(value).length > 0;
+                } else if (Array.isArray(value)) {
+                    return value.length > 0;
+                } else {
+                    return value !== '';
+                }
+            })
+        );
+    };
+
+    let config = {};
+    let update = false;
+
+    async function getConfig(items) {
+        if (!Array.isArray(items)) {
+            items = [items];
+        }
+        for (let i = 0; i < items.length; i++) {
+            const { key, prompt, choices } = items[i];
+            if (!key) {
+                if (!prompt && prompt !== '' || !choices) continue;
+                const answer = await promptForInput(prompt || `${key}: `);
+                const choice = choices[answer];
+                if (choice) {
+                    await getConfig(choice);
+                }
+            } else {
+
+                if (process.env[key]) {
+                    config[key] = process.env[key];
+                } else if (localConfig[key]) {
+                    config[key] = localConfig[key];
+                } else if (globalConfig[key]) {
+                    config[key] = globalConfig[key];
+                } else if (prompt || prompt === '') {
+                    config[key] = await promptForInput(prompt || `${key}: `);
+                    if (processEnv) process.env[key] = config[key];
+                    if (updateGlobal) update = true;
+                }
+            }
+        }
+    }
+
+    let localConfig = {};
+    const localConfigPath = path.resolve(process.cwd(), 'CoCreate.config.js');
+    if (fs.existsSync(localConfigPath)) {
+        localConfig = require(localConfigPath);
+    }
+
+    let globalConfig = {};
+    const globalConfigPath = path.resolve(os.homedir(), 'CoCreate.config.js');
+    if (fs.existsSync(globalConfigPath)) {
+        globalConfig = require(globalConfigPath);
+    }
+
+    if (items) {
+        await getConfig(items);
+
+        if (update) {
+            const updatedGlobalConfig = {
+                ...filterEmptyValues(globalConfig),
+                ...filterEmptyValues(config)
+            };
+
+            const globalConfigString = `module.exports = ${JSON.stringify(updatedGlobalConfig, null, 2)};`;
+            fs.writeFileSync(globalConfigPath, globalConfigString);
+        }
+    } else {
+        config = {
+            ...filterEmptyValues(globalConfig),
+            ...filterEmptyValues(localConfig)
+        };
+    }
+
+    return config;
+}

package/src/commands/index.js

@@ -0,0 +1,3 @@
+const config = require('./config.js');
+
+module.exports = { config }

package/src/commands/upload.js

@@ -0,0 +1,8 @@
+const crud = require('@cocreate/crud-client')
+const mime = require('mime-types')
+const fs = require('fs');
+const file = require('@cocreate/file')
+
+module.exports = async function upload(repos, args) {
+    await file()
+}

package/src/commands/git/gitConfig.js

@@ -1,71 +0,0 @@
-let fs = require('fs');
-const path = require("path");
-
-module.exports = async function linkPackages(repos, args) {
-    const failed = []
-    const prompt = require('prompt');
-
-    prompt.start();
-
-    const properties = [
-        {
-            name: 'email',
-        },
-        {
-            name: 'name',
-        },
-        {
-            name: 'username',
-        },
-        {
-            name: 'password',
-            hidden: true
-        }
-    ];
-
-    prompt.get(properties, async function (err, result) {
-        if (err) 
-            return [{
-                name: 'gitConfig',
-                des: err
-            }]
-
-        await updateConfig(result);
-    });
-
-    async function updateConfig(result){
-        (async() => {
-            for (let repo of repos) {
-                await update(repo, result);
-            }
-            console.log('finished');
-            return failed
-        })();
-    }
-
-    function update(param, result) {
-        if (!param) return;
-        let { absoutePath, name } = param;
-        let fileContent = `[core]
-        repositoryformatversion = 0
-        filemode = true
-        bare = false
-        logallrefupdates = true
-    [user]
-        name = ${result.name}
-        email = ${result.email}	
-    [remote "origin"]
-        url = https://${result.username}:${result.password}@github.com/CoCreate-app/${name}.git
-        fetch = +refs/heads/*:refs/remotes/origin/*
-    [branch "master"]
-        remote = origin
-        merge = refs/heads/master
-
-    `;
-
-        let MdPath = path.resolve(absoutePath, '.git/config');
-        if (fs.existsSync(MdPath))
-            fs.unlinkSync(MdPath);
-        fs.writeFileSync(MdPath, fileContent);
-    }
-}

package/src/commands/gitConfig.js

@@ -1,72 +0,0 @@
-let fs = require('fs');
-const path = require('path');
-const failed = [];
-
-module.exports = async function gitConfig(repos, args) {
-    try {
-      await getPrompts(repos);
-    }
-    catch (err) {
-        failed.push({ name: 'GENERAL', des: err.message });
-        console.error(err.red);
-    }
-}
-
-async function getPrompts(repos){
-    const prompt = require('prompt');
-    
-    prompt.start();
-    
-    const properties = [
-        {
-            name: 'email',
-        },
-        {
-            name: 'name',
-        },
-        {
-            name: 'username',
-        },
-        {
-            name: 'password',
-            hidden: true
-        }
-    ];
-
-    prompt.get(properties, async function (err, result) {
-        if (err) { return console.error(err); }
-        await updateConfig(repos, result);
-    });
-    
-}
-
-async function updateConfig(repos, result){
-    for (let meta of repos) {
-        if (!meta) return;
-        let fileContent = `[core]
-    	repositoryformatversion = 0
-    	filemode = true
-    	bare = false
-    	logallrefupdates = true
-    [user]
-    	name = ${result.name}
-    	email = ${result.email}	
-    [remote "origin"]
-    	url = https://${result.username}:${result.password}@${meta.repo}
-    	fetch = +refs/heads/*:refs/remotes/origin/*
-    [branch "master"]
-    	remote = origin
-    	merge = refs/heads/master
-    
-    `;
-    
-        let MdPath = path.resolve(meta.path, '.git/config');
-        if (fs.existsSync(MdPath))
-            fs.unlinkSync(MdPath);
-        fs.writeFileSync(MdPath, fileContent);
-        console.log('configured: ', meta.repo);
-    }
-    console.log('finished');
-    return failed
-
-}