@cocreate/cli 1.22.0 → 1.24.0

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [1.24.0](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.23.0...v1.24.0) (2023-04-23)
+
+
+### Features
+
+* default server is removed and replaced with main server, deleteServer removes from enabled and available ([5fed172](https://github.com/CoCreate-app/CoCreate-cli/commit/5fed172e7f2d48b413ef5a74d9ddfaf9313db066))
+
+# [1.23.0](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.22.0...v1.23.0) (2023-04-23)
+
+
+### Features
+
+* repos not required, args is an array ([7329430](https://github.com/CoCreate-app/CoCreate-cli/commit/7329430ff526291ae1ca99f647000d5581b80734))
+* repos not required, args updated to an array ([43c8197](https://github.com/CoCreate-app/CoCreate-cli/commit/43c8197d2e5d07a34842ca17b7a1bef625171daf))
+
 # [1.22.0](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.21.0...v1.22.0) (2023-04-23)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/cli",
-  "version": "1.22.0",
+  "version": "1.24.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",

package/src/coc.js

@@ -57,14 +57,16 @@ if (config['c'] && fs.existsSync(config['c'])) {
     }];
     directory = path.dirname(packageJsonPath);
     console.warn(`using ${packageJsonPath} configuration`.yellow);
-} else {
-    console.error(`a configuration file can not be found`.red);
-    process.exit(1);
-}
+} 
+// else {
+//     console.error(`a configuration file can not be found`.red);
+//     process.exit(1);
+// }
 config = { hideMessage: false, ...config };
 
 (async () => {
-    repos = await addMeta(repos, [], directory)
+    if (repos && repos.length)
+        repos = await addMeta(repos, [], directory)
     let failed = await execute(command, repos, config);
     if (failed) {
         if (failed.length === 0)

package/src/commands/nginx.js

@@ -1,4 +1,4 @@
-const {createServer, deleteServer} = require('./other/nodeCertManager.js')
+const {createServer, deleteServer} = require('./other/nginxConfigManager.js')
 
 module.exports = async function nginx(repos, args) {
     let failed = [];

package/src/commands/other/nginxConfigManager.js

@@ -66,8 +66,6 @@ server {
     listen 443 ssl http2;
     ssl_certificate /etc/letsencrypt/live/${host}/fullchain.pem;
     ssl_certificate_key /etc/letsencrypt/live/${host}/privkey.pem;
-    include /etc/letsencrypt/options-ssl-nginx.conf;
-    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
   
 }
 
@@ -80,13 +78,45 @@ server {
         let test = await exec(`sudo nginx -t`);
         if (test.stderr.includes('test is successful')) {
             await exec(`sudo systemctl reload nginx`);
-            console.log('test passed reloading nginx', host)
+            console.log(host, 'test passed reloading nginx')
             response[host] = true
         } else {
-            console.log('test failed', host)
+            console.log(host, 'test failed')
             response[host] = false
         }
     }
+
+
+    if (!fs.existsSync(`${enabled}main`)) {
+        let main = `server {
+            listen 80 default_server;
+            listen [::]:80 default_server;
+        
+        
+            server_name _;
+            return 301 https://$host$request_uri;
+        }`
+        
+        fs.writeFileSync(`${available}main`, main)
+        await exec(`sudo ln -s ${available}main ${enabled}`);
+
+        if (fs.existsSync(`${enabled}default`))
+            fs.unlinkSync(`${enabled}default`)
+        if (fs.existsSync(`${available}default`))
+            fs.unlinkSync(`${available}default`)
+        
+        let test = await exec(`sudo nginx -t`);
+        if (test.stderr.includes('test is successful')) {
+            await exec(`sudo systemctl reload nginx`);
+            console.log('main test passed reloading nginx')
+            response['main'] = true
+        } else {
+            console.log('main test failed')
+            response['main'] = false
+        }
+    
+    }
+
     return response
 }
 
@@ -95,13 +125,14 @@ async function deleteServer(hosts) {
     if (!Array.isArray(hosts))
         hosts = [hosts]
     for (let host of hosts) {
-        fs.unlinkSync(`${available}${host}`)
+        if (fs.existsSync(`${enabled}${host}`))
+            fs.unlinkSync(`${enabled}${host}`)
+        if (fs.existsSync(`${available}${host}`))
+            fs.unlinkSync(`${available}${host}`)
+            
         response[host] = true
     }
     return response
 }
 
-// createServer(['cocreate.app'])
-// deleteServer(['cocreate.app'])
-
 module.exports = {createServer, deleteServer}

package/src/execute.js

@@ -6,10 +6,11 @@ const util = require('node:util');
 const exec = util.promisify(require('node:child_process').exec);
 
 
-module.exports = async function execute(command, repos, config) {
+module.exports = async function execute(command, repos = [], config) {
     let failed = [];
-    let type = command.split(' ')[0]
-    let args = command.replace(type, '').replaceAll("'", '"').trim()
+    let args = command.replaceAll("'", '"').trim().split(' ')
+    let type = args[0]
+    args.shift()
 
     let predefined = path.resolve(__dirname, 'commands', type + '.js');
 
@@ -18,16 +19,13 @@ module.exports = async function execute(command, repos, config) {
    
         if (repos.length == 1)
             console.log(`running on ${repos[0].name} repo`.blue)
-        else
+        else if (repos.length)
             console.log('running on all repos'.blue)
 
-        failed = require(predefined)(args, repos)
+        failed = require(predefined)(repos, args)
 
     } else {
-        
-        // let type = command.split(' ')[0]
-        // let args = command.replace(type, '').replaceAll("'", '"').trim()
-
+    
         for (let repo of repos) {
             try {
                 if (repo.exclude && repo.exclude.includes(type)) 
@@ -42,7 +40,7 @@ module.exports = async function execute(command, repos, config) {
                     if (error)
                         exitCode = 1
                 } else {
-                    exitCode = await spawn(type, [`${args}`], {
+                    exitCode = await spawn(type, args, {
                         cwd: repo.absolutePath,
                         shell: true,
                         stdio: 'inherit'