cob-cli 2.35.0 → 2.35.2

package/gitignore.template

@@ -0,0 +1,14 @@
+.DS_Store
+node_modules
+.idea
+*.iml
+.env.json
+.test.in.execution
+
+# NativeScript application
+hooks
+platforms
+
+# CoB Enviroment management temporary files
+*ENV__DELETE__.*
+*ENV__ORIGINAL_BACKUP__.*

package/lib/commands/init.js

@@ -1,10 +1,11 @@
 require('colors');
 const { getCurrentCommandEnviroment } = require("../task_lists/common_enviromentHandler");
 const { newProjectTasks } = require("../task_lists/init_newProject");
-const { existingProjectTasks } = require("../task_lists/init_existingProject");
 const fs = require('fs-extra');
 const axios = require('axios');
 const git = require('simple-git');
+const https = require('https');
+
 
 /* ******************************** MAIN LOGIC **************************************** */
 async function init(servername,args) {
@@ -14,29 +15,23 @@ async function init(servername,args) {
     
     let initTasks;
     if(await projectExistsInGitAccount(projectName,args.repoaccount) ) {
-        if(args.legacy) {
-            console.log("\nError:".red + " '--legacy' is an invalid option for an already existing repositories\n")
-            return
-        } else {
-            console.log("\nGetting project", repo.bold.blue, ":" );
-            initTasks = existingProjectTasks(repo);
-        }
+        console.log("\nRepo cloned!".green);
     } else if( projectPathOkFor(projectName) && await notInsideGitRepo() && await validCobServer(cmdEnv.server)) {
         console.log("\nCreating project", projectName.bold.blue );
         initTasks = newProjectTasks(cmdEnv, projectName, repo, args )
+        initTasks.run()
+        .then( () => {
+            console.log("\nDone!".green, "\nTry:");
+            console.log("\tcd "+projectName)
+            console.log("\tcob-cli customize\n")
+        })
+        .catch(err => {
+            console.error("\n",err.message);
+        })    
     } else {
         return //Error
     }
 
-    initTasks.run()
-    .then( () => {
-        console.log("\nDone!".green, "\nTry:");
-        console.log("\tcd "+projectName)
-        console.log("\tcob-cli customize\n")
-    })
-    .catch(err => {
-        console.error("\n",err.message);
-    })
 }
 module.exports = init;
 
@@ -62,7 +57,11 @@ async function notInsideGitRepo() {
 async function validCobServer(server) {
     var result; 
     try {
-        result = await axios.get("https://"+server+"/health")
+        // At request level
+        const agent = new https.Agent({  
+            rejectUnauthorized: false
+        });
+        result = await axios.get("https://"+server+"/health", { httpsAgent: agent })
     } catch {}
     
     if(result && result.status == "200") return true
@@ -72,7 +71,9 @@ async function validCobServer(server) {
 /* ************************************ */
 async function projectExistsInGitAccount(projectName, repoaccount) {
     try {
-        await git().silent(true).listRemote(repoaccount + projectName);
+        await git().clone(repoaccount + projectName);
         return true;
-    } catch {}
+    } catch (e) {
+        return false
+    }
 }

package/lib/commands/upgradeRepo.js

@@ -97,6 +97,6 @@ function _upgrade1to2() {
 
 /* ************************************ */
 function _upgrade2to2_1() {
-    fs.writeFileSync(".gitignore", fs.readFileSync(path.resolve(__dirname,"../../templates/gitignore"), 'utf8'))
+    fs.writeFileSync(".gitignore", fs.readFileSync(path.resolve(__dirname,"../../gitignore.template"), 'utf8'))
     setVersion()
 }

package/lib/task_lists/init_newProject.js

@@ -24,7 +24,7 @@ function newProjectTasks(cmdEnv, projectName, repo, args) {
             {   title: 'git remote add origin ' + repo + ".git",                                    task: () => git().addRemote("origin", repo + ".git")                                        },
             {   title: "Get current config",                                                        task: () => copyFiles(cmdEnv,"serverLive","localCopy")                                      },
             {   title: "Preserve empty directories",                                                task: () => execa('find',[".","-type","d","-empty","-exec","touch","{}/.gitkeep",";"] )     },
-            {   title: "add .gitignore",                                                            task: () => fs.copyFile(path.resolve(__dirname, '../../templates/gitignore'), '.gitignore') },
+            {   title: "add .gitignore",                                                            task: () => fs.copyFile(path.resolve(__dirname, '../../gitignore.template'), '.gitignore') },
             {   title: "initialize version file",                                                   task: () => setVersion()                                                                    },
             {   title: "initialize prod environment folder",                                        task: () => cmdEnv.initialize()                                                             },
             {   title: "git add .",                                                                 task: () => git().add(".")                                                                  },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cob-cli",
-  "version": "2.35.0",
+  "version": "2.35.2",
   "description": "A command line utility to help Cult of Bits partners develop with higher speed and reusing common code and best practices.",
   "preferGlobal": true,
   "repository": {

package/lib/task_lists/init_existingProject.js

@@ -1,10 +0,0 @@
-const Listr = require('listr');
-const git = require('simple-git');
-
-function existingProjectTasks(repo) {
-    return new Listr([
-        { title: 'git clone ' + repo,       task: () => git().clone(repo) }
-    ]);
-}
-
-exports.existingProjectTasks = existingProjectTasks;