Oleg/feature/1536044437 (#76)

* ores/auto-commit => 'set'

* ores/auto-commit => 'set'

* ores/auto-commit => 'set'

* ores/auto-commit => 'set'

* ores/auto-commit => 'set'

* ores/auto-commit => 'set'

* ores/auto-commit => 'set'

* ores/auto-commit => 'set'

* ores/auto-commit => 'set'

* ores/auto-commit => 'set'

* ores/auto-commit => 'set'

* ores/auto-commit => 'set'

* ores/auto-commit => 'set'

* ores/auto-commit => 'set'

Author: ORESoftware

cli/index.sh

@@ -32,7 +32,7 @@ fi
 
 if ! type -f ores_get_project_root &> /dev/null; then
    npm i -s -g '@oresoftware/ores' || {
-      echo "Could not install '@oresoftware/ores'";
+      echo "Could not install '@oresoftware/ores', please check your permissions to install global npm packages.";
       exit 1;
    }
 fi
@@ -41,7 +41,7 @@ project_root="$(ores_get_project_root "$0")";
 npm_local_bin="${project_root}/node_modules/.bin";
 
 
-if [ "$use_local" == "yes" ]; then
+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.";
@@ -53,18 +53,18 @@ if false; then
     echo "$nlu_name NLU is using NPM version => $(npm --version)";
 fi
 
-if [ "$first_arg" == "init" ]; then
+if [[ "$first_arg" == "init" ]]; then
 
     shift 1;
     node "${project_root}/dist/commands/init" "$@";
 
-elif [ "$first_arg" == "ls" ]; then
+
+elif [[ "$first_arg" == "ls" ]]; then
 
     shift 1;
     node "${project_root}/dist/commands/ls" "$@";
 
-elif [ "$first_arg" == "install" ] || [ "$first_arg" == "i" ] ; then
-
+elif [[ "$first_arg" == "install" ]] || [[ "$first_arg" == "i" ]] ; then
 
   npm i -s "$@" || {
     echo "npm install command failed.";
@@ -73,23 +73,23 @@ elif [ "$first_arg" == "install" ] || [ "$first_arg" == "i" ] ; then
 
   nlu run --install-main
 
-elif [ "$first_arg" == "config" ]; then
+elif [[ "$first_arg" == "config" ]]; then
 
     shift 1;
     mkdir -p "$HOME/.nlu/global"
     node "${project_root}/dist/commands/config" "$@";
 
-elif [ "$first_arg" == "add" ]; then
+elif [[ "$first_arg" == "add" ]]; then
 
     shift 1;
     node "${project_root}/dist/commands/add" "$@";
 
-elif [ "$first_arg" == "run" ]; then
+elif [[ "$first_arg" == "run" ]]; then
 
     shift 1;
     node "${project_root}/dist/commands/run" "$@";
 
-elif [ "$first_arg" == "update" ]; then
+elif [[ "$first_arg" == "update" ]]; then
 
     shift 1;
     echo "$nlu_name 'nlu update' is not implemented.";

lib/commands/run/index.ts

@@ -10,9 +10,11 @@ import * as fs from 'fs';
 
 //npm
 import chalk from 'chalk';
+
 const dashdash = require('dashdash');
 import async = require('async');
 import residence = require('residence');
+
 const cwd = process.cwd();
 let root = residence.findProjectRoot(cwd);
 const treeify = require('treeify');
@@ -108,12 +110,14 @@ if (opts.config) {
 }
 else {
   nluConfigRoot = residence.findRootDir(cwd, '.nlu.json');
+
 }
 
 if (!nluConfigRoot) {
   nluConfigRoot = cwd;
 }
 
+
 let pkg, conf: NluConf;
 
 let hasNLUJSONFile = false;
@@ -285,6 +289,7 @@ if (opts.dry_run) {
 // when we search for projects, we ignore any projects where package.json name is "mainProjectName"
 const mainDep = map[mainProjectName] = {
   name: mainProjectName,
+
   bin: null as any,  // conf.bin ?
   hasNLUJSONFile,
   isMainProject: true,
@@ -301,9 +306,9 @@ async.autoInject({
 
       const nm = path.resolve(root + '/node_modules');
       const keys = opts.production ? productionDepsKeys : allDepsKeys;
-
+      
       determineIfReinstallIsNeeded(nm, mainDep, keys, opts, (err, val) => {
-
+        
         if (err) {
           return cb(err);
         }

lib/find-projects.ts

@@ -157,6 +157,7 @@ export const makeFindProject = function (mainProjectName: string, totalList: Map
             return path.resolve(dir, item);
           });
 
+
           let deps: Array<string>, npmlinkup: NLUDotJSON, hasNLUJSONFile = false;
 
           try {
@@ -231,6 +232,7 @@ export const makeFindProject = function (mainProjectName: string, totalList: Map
                 return cb(null);
               }
 
+
               let pkg: PkgJSON, linkable = null;
 
               try {
@@ -259,6 +261,7 @@ export const makeFindProject = function (mainProjectName: string, totalList: Map
               }
 
 
+
               if (npmlinkup.linkable === false) {
                 log.warn(`Skipping project at dir "${dirname}" because 'linkable' was set to false.`);
                 return cb(null);
@@ -290,15 +293,18 @@ export const makeFindProject = function (mainProjectName: string, totalList: Map
                 linkToItself: Boolean(npmlinkup.linkToItself),
                 runInstall: Boolean(npmlinkup.alwaysReinstall),
                 path: dirname,
+
                 deps: deps,
                 package: pkg
+
               };
 
               const nm = path.resolve(dirname + '/node_modules');
               const keys = opts.production ? getProdKeys(pkg) : getDevKeys(pkg);
 
               async.autoInject({
 
+                
                 addToSearchRoots(cb: EVCb<any>) {
 
                   const searchRoots = getSearchRootsFromNluConf(npmlinkup);

lib/run-link.ts

@@ -101,14 +101,16 @@ export const runNPMLink = (map: NluMap, opts: any, cb: EVCb<null>) => {
     if (opts.umbrella && dep.isMainProject) {
       return [];
     }
-
+    
     return deps.filter(d => {
+
       if (!map[d]) {
         log.warning('Map for key => "' + d + '" is not defined.');
         return false;
       }
       return map[d] && map[d].isLinked;
     })
+
       .map((d: string) => {
 
         const path = map[d].path;
@@ -120,7 +122,7 @@ export const runNPMLink = (map: NluMap, opts: any, cb: EVCb<null>) => {
       });
 
   };
-
+  
   const getBinMap = (bin: string | BinFieldObject, path: string, name: string) => {
 
     if (!bin) {
@@ -225,6 +227,7 @@ export const runNPMLink = (map: NluMap, opts: any, cb: EVCb<null>) => {
       log.info(`Processing dep with name => '${chalk.bold(dep.name)}'.`);
     }
 
+
     const nm = path.resolve(dep.path + '/node_modules');
 
     determineIfReinstallIsNeeded(nm, dep, getDevKeys(dep.package), opts, (err, val) => {
@@ -301,6 +304,7 @@ export const runNPMLink = (map: NluMap, opts: any, cb: EVCb<null>) => {
             log.info(`Running this command for "${chalk.bold(dep.name)}" => '${chalk.blueBright(cmd)}'.`);
           }
 
+
           const k = cp.spawn('bash', [], {
             env: Object.assign({}, process.env, {
               NPM_LINK_UP: 'yes'
@@ -339,6 +343,7 @@ export const runNPMLink = (map: NluMap, opts: any, cb: EVCb<null>) => {
             dep: dep,
             error: stderr
           });
+
         });
 
       });

lib/utils.ts

@@ -20,6 +20,7 @@ export const globalConfigFilePath = path.resolve(process.env.HOME + '/.nlu/globa
 
 export const validateConfigFile = (data: NluConf) => {
 
+
   try {
     const ajv = new Ajv({allErrors: false}); // options can be passed, e.g. {allErrors: true}
     const validate = ajv.compile(schema);
@@ -106,6 +107,7 @@ export const getDevKeys = (pkg: PkgJSON) => {
     .concat(Object.keys(pkg.optionalDependencies || {}));
 };
 
+
 export const validateOptions = (opts: any) => {
 
   try {
@@ -121,13 +123,15 @@ export const validateOptions = (opts: any) => {
 
 };
 
+
 export const mapConfigObject = (obj: any) => {
   return Object.keys(obj).reduce((a, b) => {
     const key = String(b).replace(/[^a-zA-z]+/g, '_').toLowerCase();
     return (a[key] = obj[b], a);
   }, {} as any);
 };
 
+
 const checkPackages = (dep: NluMapItem, m: Map<string, string>, sym: Set<string>): boolean => {
 
   const d = dep.package.dependencies || {};
@@ -192,6 +196,7 @@ export const determineIfReinstallIsNeeded = (nodeModulesPath: string, dep: NluMa
     return process.nextTick(cb);
   }
 
+
   fs.readdir(nodeModulesPath, (err, originalItemsInNodeModules) => {
 
     if (err || !Array.isArray(originalItemsInNodeModules)) {
@@ -208,6 +213,7 @@ export const determineIfReinstallIsNeeded = (nodeModulesPath: string, dep: NluMa
       return !String(v).startsWith('@') && String(v) !== '.bin';
     });
 
+
     const totalValid = new Set(topLevel.slice(0));
 
     const processFolder = (name: string, folder: string, cb: EVCb<null>) => {
@@ -309,7 +315,7 @@ export const determineIfReinstallIsNeeded = (nodeModulesPath: string, dep: NluMa
       if (err && result.install === true) {
         return cb(null, true);
       }
-
+      
       if (err) {
         return cb(err, false);
       }
@@ -338,10 +344,11 @@ export const determineIfReinstallIsNeeded = (nodeModulesPath: string, dep: NluMa
         return cb(null, true);
       }
 
+
       if (checkPackages(dep, map, sym)) {
         return cb(null, true);
       }
-
+      
       cb(null, false);
 
     });