@cocreate/cli 1.29.2 → 1.30.0

package/.github/workflows/automated.yml

@@ -50,6 +50,10 @@ jobs:
               uses: actions/setup-node@v3
               with:
                   node-version: 16
-
             - name: update documentation
               uses: CoCreate-app/CoCreate-docs@master
+              env:
+                organization_id: ${{ secrets.COCREATE_ORGANIZATION_ID }}
+                key: ${{ secrets.COCREATE_KEY }}
+                host: ${{ secrets.COCREATE_HOST }}
+

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [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)
+
+
+### Bug Fixes
+
+* Refactor CoCreate.config.js to remove hard-coded credentials ([a332bd9](https://github.com/CoCreate-app/CoCreate-cli/commit/a332bd97114e415c36a1264d561a7efcdc51254a))
+
 ## [1.29.2](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.29.1...v1.29.2) (2023-06-04)
 
 

package/CoCreate.config.js

@@ -1,8 +1,8 @@
 module.exports = {
     "config": {
-        "organization_id": "5ff747727005da1c272740ab",
-        "key": "2061acef-0451-4545-f754-60cf8160",
-        "host": "general.cocreate.app"
+        "organization_id": "",
+        "key": "",
+        "host": ""
     },
     "sources": [
         {

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.2",
+  "version": "1.30.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": {
@@ -60,10 +59,9 @@
   },
   "dependencies": {
     "@cocreate/docs": "^1.7.15",
-    "@cocreate/hosting": "^1.10.8",
+    "@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,66 @@
+const readline = require('readline');
+const { promises: fs } = require("fs");
+const os = require('os');
+const path = require('path');
+
+
+module.exports = async function CoCreateConfig(config = {}) {
+
+    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());
+            });
+        });
+    }
+
+    // Check if the config file exists
+    const configFilePath = path.join(os.homedir(), 'CoCreateConfig.json');
+    try {
+        const configFileContent = await fs.readFile(configFilePath, 'utf8');
+        config = JSON.parse(configFileContent);
+    } catch (error) {
+        // Ignore error if the file doesn't exist
+    }
+
+    // Prompt user for organization ID if not already stored
+    if (!config.organization_id)
+        config.organization_id = await promptForInput('Enter your organization_id: ');
+
+    if (!config.host)
+        config.host = await promptForInput('Enter the host: ');
+
+
+    async function promptForSignInOrKey() {
+        const option = await promptForInput('Choose an option:\n1. Sign In\n2. Enter Key\n');
+
+        if (option === '1') {
+            if (!config.email)
+                config.email = await promptForInput('Enter your email: ');
+
+            if (!config.password)
+                config.password = await promptForInput('Enter your password: ');
+
+        } else if (option === '2') {
+            if (!config.key)
+                config.key = await promptForInput('Enter the key: ');
+        } else {
+            console.log('Invalid option. Please try again.');
+            await promptForSignInOrKey();
+        }
+    }
+    if (!config.key && (!config.email || !config.password))
+        await promptForSignInOrKey();
+
+
+    // Save the config to the file
+    await fs.writeFile(configFilePath, JSON.stringify(config, null, 2));
+
+    return 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) {
+    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
-
-}