Oleg/feature/root (#82)

* adding tarball stuff

* ores/auto-commit => 'set'

* 0.1.322

* ores/auto-commit => 'set'

* 0.1.323

* ores/auto-commit => 'set'

* foop

* installed set

* works

* roots

* changes

Author: ORESoftware

.nlu.json

@@ -13,6 +13,7 @@
     "/.git/"
   ],
   "list": [
+    "@oresoftware/envstr",
     "@oresoftware/shell",
     "prepend-transform",
     "residence",

.npmignore

@@ -11,15 +11,19 @@ media
 .vscode
 scripts
 docs
+lib
 
 ### matching files
 *.md
 *.txt
 *.log
 tsconfig*.json
 *.yml
+Dockerfile*
+
 
 ### files
+.nlu.json
 .gitignore
 .npmignore
 .npmrc

assets/postinstall.sh

@@ -2,7 +2,7 @@
 
 set -e;
 
-if [ "$skip_postinstall" == "yes" ]; then
+if [[ "$skip_postinstall" == "yes" ]]; then
     echo "skipping nlu postinstall routine.";
     exit 0;
 fi
@@ -44,10 +44,13 @@ mkdir -p "$HOME/.oresoftware/bash" && {
 }
 
 (
+
+  if [[ -f "node_modules/@oresoftware/shell/assets/shell.sh" ]]; then
     cat "node_modules/@oresoftware/shell/assets/shell.sh" > "$HOME/.oresoftware/shell.sh" && {
         echo "Successfully copied @oresoftware/shell/assets/shell.sh to $HOME/.oresoftware/shell.sh";
         exit 0;
     }
+  fi
 
     curl -H 'Cache-Control: no-cache' \
     "https://raw.githubusercontent.com/oresoftware/shell/master/assets/shell.sh?$(date +%s)" \

cli/index.sh

@@ -3,7 +3,8 @@
 
 echo;
 my_args=( "$@" );
-first_arg="$1"
+first_arg="$1";
+shift 1;
 
 export nlu_name="[nlu/npm-link-up]"
 
@@ -25,7 +26,6 @@ if nlu_match_arg "--no-use-local" "${my_args[@]}"; then
   use_local="nope"
 fi
 
-
 if nlu_match_arg "--no-local" "${my_args[@]}"; then
   use_local="nope"
 fi
@@ -39,12 +39,12 @@ fi
 
 project_root="$(ores_get_project_root "$0")";
 npm_local_bin="${project_root}/node_modules/.bin";
-
+commands="${project_root}/dist/commands"
 
 if [[ "$use_local" == "yes" ]]; then
    if false; then
-    echo "$nlu_name NLU is addding local 'node_modules/.bin' executables to the PATH.";
-    echo "To not add local command line tools to the PATH, use the --no-local option.";
+        echo "$nlu_name NLU is addding local 'node_modules/.bin' executables to the PATH.";
+        echo "To not add local command line tools to the PATH, use the --no-local option.";
     fi
     export PATH="${npm_local_bin}:${PATH}";
 fi
@@ -55,50 +55,43 @@ fi
 
 if [[ "$first_arg" == "init" ]]; then
 
-    shift 1;
-    node "${project_root}/dist/commands/init" "$@";
-
+    node "$commands/init" "$@";
 
 elif [[ "$first_arg" == "ls" ]]; then
 
-    shift 1;
-    node "${project_root}/dist/commands/ls" "$@";
+    node "$commands/ls" "$@";
 
 elif [[ "$first_arg" == "install" ]] || [[ "$first_arg" == "i" ]] ; then
 
-  npm i -s "$@" || {
+  npm i -s || {
     echo "npm install command failed.";
     exit 1;
   }
 
-  nlu run --install-main
+  nlu run --install-main "$@"
 
 elif [[ "$first_arg" == "config" ]]; then
 
-    shift 1;
     mkdir -p "$HOME/.nlu/global"
-    node "${project_root}/dist/commands/config" "$@";
+    node "$commands/config" "$@";
 
 elif [[ "$first_arg" == "add" ]]; then
 
-    shift 1;
-    node "${project_root}/dist/commands/add" "$@";
+    node "$commands/add" "$@";
 
 elif [[ "$first_arg" == "run" ]]; then
 
-    shift 1;
-    node "${project_root}/dist/commands/run" "$@";
+    node "$commands/run" "$@";
 
 elif [[ "$first_arg" == "update" ]]; then
 
-    shift 1;
     echo "$nlu_name 'nlu update' is not implemented.";
     echo "$nlu_name You should manually update your .nlu.json files.";
     exit 1;
 
 else
 
-    node "${project_root}/dist/commands/basic" "$@";
+    node "$commands/basic" "${my_args[@]}";
 
 fi
 

lib/commands/add/index.ts

@@ -224,7 +224,7 @@ async.autoInject({
       let cleanMap;
 
       try {
-        cleanMap = getCleanMap(mainProjectName, getMatchingProjects);
+        cleanMap = getCleanMap(mainProjectName, getMatchingProjects, opts);
       }
       catch (err) {
         return process.nextTick(cb, err);

lib/commands/basic/cmd-line-opts.ts

@@ -44,6 +44,15 @@ export default [
     default: false,
     hidden: true
   },
+  
+  {
+    names: ['json'],
+    type: 'bool',
+    help: 'Write stdout info as JSON (use json-stdio to parse it).',
+    default: false,
+    hidden: true,
+    env: 'nlu_setting_json'
+  },
 
   {
     names: ['bash-completion', 'completion'],

lib/commands/basic/index.ts

@@ -12,6 +12,7 @@ import addOpts from '../add/cmd-line-opts';
 import initOpts from '../init/cmd-line-opts';
 import runOpts from '../run/cmd-line-opts';
 import * as nluUtils from '../../utils';
+import * as stdio from 'json-stdio';
 
 process.once('exit', code => {
   log.info('Exiting with code:', code, '\n');
@@ -41,7 +42,13 @@ try {
 }
 
 if (opts.version) {
-  console.log(npmLinkUpPkg.version);
+  if(opts.json){
+    stdio.log(npmLinkUpPkg.version);
+  }
+  else{
+    console.log(npmLinkUpPkg.version);
+  }
+  
   process.exit(0);
 }
 

lib/commands/run/index.ts

@@ -76,7 +76,6 @@ if (opts.help) {
   process.exit(0);
 }
 
-
 try {
   globalConf = require(globalConfigFilePath);
 }
@@ -93,11 +92,10 @@ if (Array.isArray(globalConf)) {
   globalConf = {};
 }
 
-const {nluFilePath, nluConfigRoot} = handleConfigCLIOpt(cwd,opts);
+const {nluFilePath, nluConfigRoot} = handleConfigCLIOpt(cwd, opts);
 
 let pkg, conf: NluConf, hasNLUJSONFile = false;
 
-
 try {
   conf = require(nluFilePath);
   opts.umbrella = opts.umbrella || Boolean(conf.umbrella);
@@ -237,7 +235,7 @@ const originalList = list.slice(0);
 if (!list.includes(mainProjectName)) {
   // always include the very project's name
   if (!opts.umbrella) {
-    list.push(mainProjectName);
+    list.push(mainProjectName); // TODO this might be causing the project to always link to itself?
   }
 }
 
@@ -263,17 +261,19 @@ if (opts.dry_run) {
 
 // add the main project to the map
 // when we search for projects, we ignore any projects where package.json name is "mainProjectName"
-const mainDep = map[mainProjectName] = {
+const mainDep = map[root] = {
   name: mainProjectName,
-  
   bin: null as any,  // conf.bin ?
   hasNLUJSONFile,
   isMainProject: true,
   linkToItself: conf.linkToItself,
   runInstall: conf.alwaysReinstall,
   path: root,
   deps: list,
-  package: pkg
+  package: pkg,
+  searchRoots: null as Array<string>,
+  installedSet: new Set(),
+  linkedSet: {}
 };
 
 async.autoInject({
@@ -328,7 +328,15 @@ async.autoInject({
 
     mapSearchRoots(npmCacheClean: any, cb: EVCb<any>) {
       opts.verbosity > 3 && log.info(`Mapping original search roots from your root project's "searchRoots" property.`);
-      mapPaths(searchRoots, nluConfigRoot, cb);
+      mapPaths(searchRoots, nluConfigRoot, (err, roots) => {
+        
+        if (err) {
+          return cb(err);
+        }
+        
+        mainDep.searchRoots = roots.slice(0);
+        cb(err, roots);
+      });
     },
 
     findItems(mapSearchRoots: Array<string>, cb: EVCb<any>) {
@@ -353,9 +361,7 @@ async.autoInject({
       const findProject = makeFindProject(mainProjectName, totalList, map, ignore, opts, status, conf);
 
       searchRoots.forEach(sr => {
-        q.push(cb => {
-          findProject(sr, cb);
-        });
+        q.push(cb => findProject(sr, cb));
       });
 
       if (q.idle()) {
@@ -389,12 +395,12 @@ async.autoInject({
         return !map[v];
       });
 
-      if (unfound.length > 0) {
+      if (false && unfound.length > 0) {
         log.warn(`The following packages could ${chalk.bold('not')} be located:`);
-        for(let i of unfound.keys()){
-          log.warn(chalk.bold(String(i+1), chalk.bold.green(unfound[i])));
+        for (let i of unfound.keys()) {
+          log.warn(chalk.bold(String(i + 1), chalk.bold.green(unfound[i])));
         }
-       
+        
         if (!opts.allow_missing) {
           console.error();
           log.warn('The following paths (and their subdirectories) were searched:');
@@ -415,7 +421,7 @@ async.autoInject({
           cleanMap = getCleanMapOfOnlyPackagesWithNluJSONFiles(mainProjectName, map);
         }
         else {
-          cleanMap = getCleanMap(mainProjectName, map);
+          cleanMap = getCleanMap(mainDep, map, opts);
         }
       }
       catch (err) {
@@ -451,18 +457,20 @@ async.autoInject({
     const cleanMap = results.runUtility;
 
     if (cleanMap && typeof cleanMap === 'object') {
-      
-      const treeObj = createTree(cleanMap, mainProjectName, originalList, opts);
+  
+      const treeObj = createTree(cleanMap, mainDep.path, mainDep, opts);
+      // const treeObj = createTree(cleanMap, mainProjectName, originalList, opts);
       const treeString = treeify.asTree(treeObj, true);
-      const formattedStr = String(treeString).split('\n').map(function (line) {
-        return '\t' + line;
-      });
+      const formattedStr = [''].concat(String(treeString).split('\n')).map(function (line) {
+        return ' look here: \t' + line;
+      }).concat('');
 
       if (opts.verbosity > 1) {
+        console.log();
         log.info(chalk.cyan.bold('NPM-Link-Up results as a visual:'), '\n');
-        console.log('^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^');
+        // console.log('^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^');
         console.log(chalk.white(formattedStr.join('\n')));
-        console.log('^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^');
+        // console.log('^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^');
       }
     }
     else {