Merge branch 'master' of http://git.bbh/chess/elxr into master

index.js

@@ -36,7 +36,17 @@ var globSync = require('glob').sync;
 
 var ENV = Object.assign({}, process.env); // Shallow clone it.
 
+const { readdir } = require("fs").promises
+
+// Directory shallow walk and do perform on each dir.
+const dirs = async (perform, path) => {
+  for (const dir of await readdir(path || process.cwd(), { withFileTypes: true })) {
+    if (dir.isDirectory()) perform(dir)
+  }
+}
+
 var getShellTask = (command, args, options) => {
+  options = options || {}
   return () => {
     var p = nodeShellExec.apply(null, [command, args, Object.assign({
       inherit: true, shell: true, env: ENV, title: `${command} ${args}`
@@ -72,12 +82,12 @@ var getPullCmd = (repo, branch) => {
   if(branch) {
     var pullCmd = [ gitInstallDir
       , ['-c', 'for i in `git remote`; do git pull $i ' + branch + '; done;']
-      , { cwd : repo, title : 'pull all origins for ' + repo }]
+      , { cwd: instanceroot + '/' + repo, title : 'pull all origins for ' + repo }]
   }
   else {
-    var pullCmd = [gitInstallDir
+    var pullCmd = [gitbash
       , ['-c', 'branch=`git rev-parse --abbrev-ref HEAD`;for i in `git remote`; do git pull $i $branch; done;']
-      , { cwd: repo, title: 'pull all origins for ' + repo }]
+      , { cwd: instanceroot + '/' + repo, title: 'pull all origins for ' + repo }]
   }
   // var pullCmd = ['pullall', [], { cwd : repo }]
   if (useGitPull) pullCmd = ['git', ['pull'], {
@@ -114,7 +124,8 @@ var performPull = (repo, branch) => {
     return nodeShellExec('git', ['clone', '-c', 'core.symlinks=true', defaultRepoServer + `/${defaultRepoOwner}/` + repo + '.git'],
       {
         inherit: true, shell: true,
-        env: process.env
+          env: process.env
+        , cwd : instanceroot 
         , runas: processedArgs.runas
       }).catch((e) => {
         throw e;
@@ -124,7 +135,7 @@ var performPull = (repo, branch) => {
           {
             inherit: true, shell: true,
             env: process.env
-            , cwd: repo
+            , cwd: instanceroot + '/' + repo
             , runas: processedArgs.runas
             , title: `git core.symlinks --replace-all true for ${defaultRepoServer + `/${defaultRepoOwner}/` + repo + '.git'}`
           })
@@ -199,8 +210,8 @@ var dbForLabel = function (label) {
 }
 
 // SAM : TODO Use nodeshellexec where to detect git installation dir
-var gitInstallDir = "C:\\Program Files\\Git\\bin\\sh.exe"
-// var gitInstallDir = "G:\\Installed\\Git\\bin\\sh.exe"
+var gitbash = "C:\\Program Files\\Git\\bin\\sh.exe"
+// var gitbash = "G:\\Installed\\Git\\bin\\sh.exe"
 // Relevant git repos
 // var repomanifest = require('../'+repomanifest.instanceName+'-config-'+ nodeenv +'/repo-manifest')()
 var exludeMergeRepos = [];
@@ -209,7 +220,13 @@ var configPromise = null
 
 // elxr cli operations
 var op = {
-  'h': () => { console.log(elxr.info()); return '-h' }
+  'h': () => { console.log(elxr.help()); return '-h' }
+  , 'clean' : () => {
+    // delete all node_module folders and links.
+    var tasklist = [];
+    dirs( (repodir)=> tasklist.push(getShellTask('rm',['-rf', 'node_modules'], { cwd : instanceroot + '/' + repodir.name })()), instanceroot )
+    return Promise.all(tasklist)
+  }
   , 'undefined': () => { return op.h(); }
   , 'reset': () => {
 
@@ -415,10 +432,10 @@ var op = {
           , env: process.env
         }]
         // PB : TODO -- Do this conditionally only...
-        , ['git', ['remote', 'rename', 'origin', 'githubclone'], { cwd: `${repo}` }, (err) => {
+        , ['git', ['remote', 'rename', 'origin', 'githubclone'], { cwd: `${instanceroot + '/' + repo}` }, (err) => {
           console.log('Ignoring origin rename error : ' + err); return true; //return true to continue.
         }] // PB ; Todo -- new repositories created locally will not have origin. Handle this failure.
-        , ['git', ['remote', 'add', 'origin', `${defaultRepoServer}/${repo}.git`], { cwd: `${repo}` }]
+        , ['git', ['remote', 'add', 'origin', `${defaultRepoServer}/${repo}.git`], { cwd: `${instanceroot + '/' + repo}` }]
         // PB : TODO -- If threre is a gitbubclone origin 
         // Set the master to pull from the local repo.
       ]
@@ -432,7 +449,7 @@ var op = {
       }
     }
 
-    sequentialTaskShellCommands.push(['git', ['push', 'origin', 'master'], { cwd: `${repo}` }])
+    sequentialTaskShellCommands.push(['git', ['push', 'origin', 'master'], { cwd: `${instanceroot + '/' + repo}` }])
     // console.dir(sequentialTaskShellCommands);
 
     var tasks = [];
@@ -455,11 +472,11 @@ var op = {
     remotename = remotename || processedArgs._[1]
     url = url || processedArgs._[2]
     var serial_perform_git_seturl = (repo) => {
-      var options = { cwd: repo }
+      var options = { cwd: instanceroot + '/' + repo }
       // console.log(repo)
       if (pushable) {
         return [
-          ['git', ['remote', 'set-url', remotename, url + '/' + repo], { cwd: repo }]
+          ['git', ['remote', 'set-url', remotename, url + '/' + repo], { cwd: instanceroot + '/' + repo }]
         ]
       }
       else {
@@ -476,14 +493,6 @@ var op = {
       })
     }
 
-    const { readdir } = require("fs").promises
-
-    const dirs = async (perform, path) => {
-      for (const dir of await readdir(path || process.cwd(), { withFileTypes: true })) {
-        if (dir.isDirectory()) perform(dir)
-      }
-    }
-
     dirs(perform_git_seturl)
   }
   , 'add': (remotename, url, branch) => {
@@ -492,22 +501,22 @@ var op = {
     url = url || processedArgs._[2]
     branch = branch || processedArgs._[3]
     var serial_perform_git_add = (repo) => {
-      var options = { cwd: repo }
+      var options = { cwd: instanceroot + '/' + repo }
       // console.log(repo)
       if (pushable) {
         return [
-          ['git', ['remote', 'add', remotename, url + '/' + repo], { cwd: repo }]
-          , ['git', ['pull', remotename, branch], { cwd: repo }]
-          , ['git', ['branch', `--set-upstream-to=${remotename}/${branch}`, branch], { cwd: repo }]
+          ['git', ['remote', 'add', remotename, url + '/' + repo], { cwd: instanceroot + '/' + repo }]
+          , ['git', ['pull', remotename, branch], { cwd: instanceroot + '/' + repo }]
+          , ['git', ['branch', `--set-upstream-to=${remotename}/${branch}`, branch], { cwd: instanceroot + '/' + repo }]
         ]
       }
       else {
 
         return [
-          ['git', ['remote', 'add', remotename, url + '/' + repo], { cwd: repo }]
-          , ['git', ['remote', `set-url`, '--push', remotename, 'no-pushing'], { cwd: repo }]
-          , ['git', ['pull', remotename, branch], { cwd: repo }]
-          , ['git', ['branch', `--set-upstream-to=${remotename}/${branch}`, branch], { cwd: repo }]
+          ['git', ['remote', 'add', remotename, url + '/' + repo], { cwd: instanceroot + '/' + repo }]
+          , ['git', ['remote', `set-url`, '--push', remotename, 'no-pushing'], { cwd: instanceroot + '/' + repo }]
+          , ['git', ['pull', remotename, branch], { cwd: instanceroot + '/' + repo }]
+          , ['git', ['branch', `--set-upstream-to=${remotename}/${branch}`, branch], { cwd: instanceroot + '/' + repo }]
         ]
       }
 
@@ -549,10 +558,10 @@ var op = {
   , 'remove': (remotename) => {
     remotename = remotename || processedArgs._[1]
     var serial_perform_git_remove = (repo) => {
-      var options = { cwd: repo }
+      var options = { cwd: instanceroot + '/' + repo }
       // console.log(repo)
       return [
-        ['git', ['remote', 'remove', remotename], { cwd: repo }]
+        ['git', ['remote', 'remove', remotename], { cwd: instanceroot + '/' + repo }]
       ]
     }
     var x = (args) => {
@@ -593,12 +602,12 @@ var op = {
     user = user || processedArgs._[1]
     if (!user) throw 'User name required'
     var serial_perform_init_gitea = (repo) => {
-      var options = { cwd: repo }
+      var options = { cwd: instanceroot + '/' + repo }
       // console.log(repo)
       return [
-        ['git', ['remote', 'add', 'chess', `${defaultRepoServer}/${user}/${repo}.git`], { cwd: repo }]
-        , ['git', ['remote', 'set-url', '--push', 'chess', 'no-pushing'], { cwd: repo }]
-        , ['git', ['remote', 'set-url', 'origin', `${defaultRepoServer}/${user}/${repo}.git`], { cwd: repo }]
+        ['git', ['remote', 'add', 'chess', `${defaultRepoServer}/${user}/${repo}.git`], { cwd: instanceroot + '/' + repo }]
+        , ['git', ['remote', 'set-url', '--push', 'chess', 'no-pushing'], { cwd: instanceroot + '/' + repo }]
+        , ['git', ['remote', 'set-url', 'origin', `${defaultRepoServer}/${user}/${repo}.git`], { cwd: instanceroot + '/' + repo }]
       ]
     }
     var x = (args) => {
@@ -721,13 +730,18 @@ var op = {
   , 'npmi': () => {
     var tasks = [];
 
+    // Build fails without babel...
+    tasks.push(getShellTask(
+      'npm',[ 'i', '-g', 'babel-cli' ]
+    ) )
 
     var npmbuildrepos = ['loopback-jsonapi-model-serializer']
+    npmbuildrepos = []
     npmbuildrepos.forEach(repo => {
       tasks.push(() => {
         return nodeShellExec('npm', ['i --force'], {
           inherit: true, shell: true
-          , cwd: repo
+          , cwd: instanceroot + '/' + repo
           , env: process.env
           , title: `npm i for ${repo}`
         }).catch((e) => {
@@ -736,7 +750,7 @@ var op = {
           console.log(`--------------------npm run build for ${repo}--------------------`)
           return nodeShellExec('npm', ['run build'], {
             inherit: true, shell: true
-            , cwd: repo
+            , cwd: instanceroot + '/' + repo
             , env: process.env
             , title: `npm run build for ${repo}`
           }).then(Tasq.then).catch(Tasq.catch)
@@ -749,19 +763,28 @@ var op = {
       gitRepos.push('client/server');
       gitRepos = gitRepos.concat(elevatedRunasRepos);
 
+      // gitRepos = ['bbhverse', 'serververse', 'elixir-server'
+      //   , 'client'
+      // ];
       var rmtasks = []
       var repotasks = []
       gitRepos.forEach(repo => {
 
-        rmtasks.push(() => {
-          console.log(`--------------------rm package-lock.json for ${repo}--------------------`)
-          return nodeShellExec('rm', ['package-lock.json'], {
-            inherit: true, shell: true
-            , cwd: repo
-            , env: process.env
-            , title: `rm 'package-lock.json' for ${repo}`
-          }).catch((e) => { console.error(e) })
-        })
+        rmtasks.push(
+          // () => {
+            // console.log(`--------------------rm package-lock.json for ${repo}--------------------`)
+            // return nodeShellExec(`"${gitbash}"`, ['-c', '"rm  package-lock.json"'], {
+            nodeShellExec('rm', ['package-lock.json'], {
+              inherit: true, shell: true
+              , cwd: instanceroot + '/' + repo
+              , env: process.env
+              , title: `rm 'package-lock.json' for ${repo}`
+            })
+            .then(()=>{
+              console.log(`--------------------rm package-lock.json for ${repo}--------------------`)
+            }).catch((e) => { console.error(e) })
+          // }
+        )
 
         if (npmbuildrepos.indexOf(repo) < 0) {
           repotasks.push(
@@ -769,7 +792,7 @@ var op = {
               console.log(`--------------------npm i for ${repo}--------------------`)
               var p = nodeShellExec('npm', ['i --force'], {
                 inherit: true, shell: true
-                , cwd: repo
+                , cwd: instanceroot + '/' + repo
                 , env: process.env
                 , title: `npm i for ${repo}`
               }).then(Tasq.then).catch(Tasq.catch)
@@ -778,19 +801,37 @@ var op = {
         }
       })
 
+
+      // PB : TODO -- npm i for client is for some reason not complete so bower doesn't get installed !!!
+      // Second time try also doesnt work.
+      // repotasks.push(
+      //   () => {
+      //     console.log(`--------------------second time npm i for client--------------------`)
+      //     var p = nodeShellExec('npm', ['i --force'], {
+      //       inherit: true, shell: true
+      //       , cwd: instanceroot + '/' + 'client'
+      //       , env: process.env
+      //       , title: `npm i for client`
+      //     }).then(Tasq.then).catch(Tasq.catch)
+      //     return p;
+      //   })
+
       var bowerRepos = ['client']
       bowerRepos.forEach(repo => {
         repotasks.push(() => {
-          var p = nodeShellExec('bower', ['install'], {
+          console.log(instanceroot + '/' + repo + '/node_modules/bower/bin/bower')
+          var p = nodeShellExec('node_modules/bower/bin/bower', ['install'], {
+          // var p = nodeShellExec(`"${gitbash}"`, ['-c', '"node_modules/bower/bin/bower i"'], {
+
             inherit: true, shell: true
-            , cwd: repo
+            , cwd: instanceroot + '/' + repo
             , env: process.env
             , title: `bower i for ${repo}`
           }).then(Tasq.then).catch(Tasq.catch)
           return p;
         })
       })
-
+      // console.log('rmtasks.length : ' + rmtasks.length)
       return Promise.all(rmtasks).then(() => any(repotasks));
     }).catch(e => {
 
@@ -811,7 +852,7 @@ var op = {
       shell: true,
       detached: true,
       stdio: 'ignore',
-      cwd: 'elixir-server'
+      cwd: instanceroot + '/' + 'elixir-server'
       , env: env
     })
 
@@ -846,7 +887,7 @@ var op = {
       shell: true,
       detached: true,
       stdio: 'ignore',
-      cwd: 'client'
+      cwd: instanceroot + '/' + 'client'
       , env: env
     })
     // .catch(e=>console.error(e))
@@ -937,7 +978,7 @@ var op = {
       return nodeShellExec('git', ['checkout', branch || checkoutMap[runconfig.NODE_ENV] || runconfig.NODE_ENV], {
         // return nodeShellExec('git', ['switch', '-m', '-C', checkoutMap[runconfig.NODE_ENV] || runconfig.NODE_ENV], {
         // inherit : true, shell: true, 
-        cwd: repo
+        cwd: repoinstanceroot + '/' + repo
         // , stdio : ignore // Use when we want to silcence output completely.
         , runas: processedArgs.runas
         , title: `git checkout ${branch || checkoutMap[runconfig.NODE_ENV] || runconfig.NODE_ENV} for ${repo}`
@@ -949,7 +990,7 @@ var op = {
       if (excludeCheckouts[repo]) return Promise.resolve({ 'skipped': true })
       return nodeShellExec('git', ['pull', '--all'], {
         // inherit : true, shell: true, 
-        cwd: repo
+        cwd: instanceroot + '/' + repo
         , runas: processedArgs.runas
         , title: `git pull -all for ${checkoutMap[runconfig.NODE_ENV] || runconfig.NODE_ENV} ${repo}`
       }).catch((e) => { console.error(e); return { error: true, message: repo } })
@@ -969,13 +1010,13 @@ var op = {
       if (exludeMergeRepos[repo]) return Promise.resolve({ 'skipped': true })
       return nodeShellExec('git', ['merge', mergeSource], {
         inherit: true, shell: true,
-        cwd: repo
+        cwd: instanceroot + '/' + repo
         , runas: processedArgs.runas
       }).catch((e) => { console.error(e) })
     }
     if (runconfig.NODE_ENV === 'development') performMerge = () => { return Promise.resolve(true) }
 
-    any(tasks).then(() => {
+    return any(tasks).then(() => {
       if (!processedArgs.runas) return op['runas']()
 
       tasks = [
@@ -983,6 +1024,7 @@ var op = {
           // Use junctions to avoid npm package issues
           var p = nodeShellExec('mklink', ['/J', 'config', runconfig.use + '-config' + '-' + process.env.NODE_ENV], {
             inherit: true, shell: true
+            , cwd : instanceroot
             , env: process.env
           }).catch((e) => { console.error(e) })
           return p;
@@ -994,6 +1036,7 @@ var op = {
             () => {
               var p = nodeShellExec('mklink', ['/J', 'data', runconfig.use + '-data'], {
                 inherit: true, shell: true
+                , cwd : instanceroot
                 , env: process.env
               }).catch((e) => { console.error(e) })
               return p;
@@ -1379,7 +1422,7 @@ var acquireConfig = function (selected, chessinstances) {
   })
 }
 
-var launchpath = process.cwd()
+var launchpath = process.cwd().replace(/\\/, '/')
 var thisscriptdir = __dirname
 var instanceroot = launchpath;
 var detectInstance = function () {
@@ -1399,13 +1442,13 @@ var detectInstance = function () {
       // It could be a standalone elxr build which may or maynot be in the proper location.
       if (BUILD_VERSION.indexOf('Version: {version} - built on {date}') > -1) {
         // Unbuilt therefore we are in the elxr directory.
-        root = path.normalize(launchpath + '../');
+        root = path.normalize(launchpath + '/..');
       }
       else {
         // Built version.
         // check if we have a elxr subfolder.
         if (fs.existsSync(launchpath + '/..' + path.normalize('/elxr'))) {
-          // Probably in the right place.
+          // Probably in the right place.        
           root = path.normalize(launchpath + '/..');
         }
         else {
@@ -1416,7 +1459,7 @@ var detectInstance = function () {
       }
     }
   }
-  instanceroot = root;
+  instanceroot = root.replace(/\\/, '/');
   var __default = {
 
     // Default is public server only.
@@ -1584,8 +1627,8 @@ var maintask = () => {
       }
       catch (e) {
         console.error(e)
-        console.error('No local instances found in current root = ' + selectedinstance.root);
-        console.log('We will create a new one with the instance and environment chosen...')
+        console.error('No local instances config found in current root = ' + selectedinstance.root);
+        console.log('A config will be createed with the instance and environment chosen...')
       }
       finally {
         

package.json

@@ -6,13 +6,17 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build-commented": "rollup index.js --format cjs --file elxr.js",
-    "build": "rollup -c"
+    "build": "rollup -c",
+    "index": "SET FORCE_COLOR=true && node index"
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "bbhverse": "file:../bbhverse",
+    "bbhverse": "git+http://git.bbh/chess/bbhverse",
+    "global-this": "git+http://git.bbh/chess/global-this",
+    "moment": "^2.27.0",
+    "crossfilter2": "^1.5.4",
     "chalk": "^4.1.0",
     "glob": "^7.1.2",
     "tree-kill": "^1.2.2"