node-power-user 0.0.31 → 0.0.33

package/dist/index.js

@@ -24,6 +24,14 @@ const os = require('os');
 // const npm = require('npm');
 
 function Main() {
+  const self = this;
+  
+  self.options = {};
+  self.npu_packageJSON = {};
+  self.proj_path = null;
+  self.proj_packageJSONPath = null;
+  self.proj_packageJSON = {};
+  self.proj_allDependencies = {};
 
 }
 
@@ -43,8 +51,9 @@ Main.prototype.process = async function (options) {
     self.proj_path = process.cwd();
     self.proj_packageJSONPath = path.resolve(self.proj_path, './package.json');
     self.proj_packageJSON = require(self.proj_packageJSONPath);
-    self.proj_packageJSON.allDependencies = _.merge({}, self.proj_packageJSON.peerDependencies, self.proj_packageJSON.devDependencies, self.proj_packageJSON.dependencies);
-    self.proj_packageJSON.allDependenciesKeys = Object.keys(self.proj_packageJSON.allDependencies);
+    self.proj_allDependencies.pairs = _.merge({}, self.proj_packageJSON.peerDependencies, self.proj_packageJSON.devDependencies, self.proj_packageJSON.dependencies);
+    self.proj_allDependencies.list = Object.keys(self.proj_allDependencies.pairs);
+
   } catch (e) {
     self.proj_packageJSON = {
       name: 'Unknown Name',
@@ -73,29 +82,29 @@ Main.prototype.process = async function (options) {
     self.options[arg] = argv[arg]
   });
 
-  if (self.options.d || self.options.debug || process.env.NPU_LOG === 'true') {
+  if (self.options.d || self.options.debug || self.options._.includes('debug') || process.env.NPU_LOG === 'true') {
     console.log('argv', argv);
     console.log('options', self.options); 
   }
 
-  if (self.options.wait) {
+  if (self.options.wait || self.options._.includes('wait')) {
     const time = parseInt(typeof self.options.wait === 'number' ? self.options.wait : 1000);
     self.log(chalk.blue(`Waiting ${time}...`));
     await powertools.wait(time);
     self.log(chalk.green(`Done waiting`));
   }  
 
-  if (self.options.v || self.options.version) {
+  if (self.options.v || self.options.version || self.options._.includes('version')) {
     self.log(chalk.blue(`Node Power User is v${chalk.bold(self.npu_packageJSON.version)}`));
     return self.npu_packageJSON.version;
   }
 
-  if (self.options.pv || self.options.project || self.options['project-version']) {
+  if (self.options.pv || self.options.project || self.options['project-version'] || self.options._.includes('project')) {
     self.log(chalk.blue(`The current project (${chalk.bold(self.proj_packageJSON.name)}) is v${chalk.bold(self.proj_packageJSON.version)}`));
     return self.proj_packageJSON.version;
   }
 
-  if (self.options.lp || self.options.listpackages || self.options['list-packages']) {
+  if (self.options.lp || self.options.listpackages || self.options['list-packages'] || self.options._.includes('listpackages')) {
     self.log(chalk.blue.bold(`Dependencies:`));
    
     Object.keys(self.proj_packageJSON.dependencies || {})
@@ -122,7 +131,7 @@ Main.prototype.process = async function (options) {
     };
   }
 
-  if (self.options.out || self.options.outdated || self.options.match) {
+  if (self.options.out || self.options.outdated || self.options.match || self.options._.includes('out') || self.options._.includes('outdated') || self.options._.includes('match')) {
     // self.log(chalk.blue.bold(`Outdated:`));
     // self.log(chalk.green(`name: package = installed`));
 
@@ -140,22 +149,26 @@ Main.prototype.process = async function (options) {
       },
     }  
     const progress = new ProgressBar.SingleBar({}, ProgressBar.Presets.shades_classic);
-    progress.start(self.proj_packageJSON.allDependenciesKeys.length, 0);
+    progress.start(self.proj_allDependencies.list.length, 0);
 
     const response = {};
 
     let bumpCommand = '';
 
-    for (var i = 0; i < self.proj_packageJSON.allDependenciesKeys.length; i++) {
+    for (var i = 0; i < self.proj_allDependencies.list.length; i++) {
       progress.update(i);
-      const dep = self.proj_packageJSON.allDependenciesKeys[i];
-      const packageVersion = _coerce(self.proj_packageJSON.allDependencies[dep]);
+      const dep = self.proj_allDependencies.list[i];
+      const depPair = self.proj_allDependencies.pairs[dep];
+      const packageVersion = _coerce(depPair);
       const installedVersion = _coerce(
-        _getVersion(
-          (await asyncCommand(`npm list ${dep} --depth=0 | grep ${dep}`))
-            .split(' ')[1]
+        _getListVersion(
+          (await asyncCommand(`npm list ${dep} --depth=0 | grep ${dep}`)).split(' ')
         )
       );
+
+      // console.log('---', dep, depPair, _.get(packageVersion, 'version'), _.get(installedVersion, 'version'));
+
+      // console.log('---dep', dep, packageVersion, installedVersion);
       const latestVersion = await getLatestVersion(dep);
       const isEqual = _isEqual(installedVersion, packageVersion);
       const isLatest = _isEqual(packageVersion, latestVersion);
@@ -227,7 +240,7 @@ Main.prototype.process = async function (options) {
     return response;  
   }
 
-  if (self.options.global || self.options.g) {
+  if (self.options.global || self.options.g || self.options._.includes('global')) {
     const parentPath = `/Users/${os.userInfo().username}/.nvm/versions/node`;
     const versions = jetpack.list(parentPath);
     const currentNode = process.versions.node;
@@ -303,7 +316,7 @@ Main.prototype.process = async function (options) {
     return response;
   }
 
-  if (self.options.clean) {
+  if (self.options.clean || self.options._.includes('clean')) {
     const NPM_INSTALL_FLAG = self.options['no-optional'] || self.options['nooptional'] ? '--no-optional' : ''
     const NPM_CLEAN = `rm -fr node_modules && rm -fr package-lock.json && npm cache clean --force && npm install ${NPM_INSTALL_FLAG} && npm rb`;
     
@@ -318,7 +331,7 @@ Main.prototype.process = async function (options) {
     })
   }
 
-  if (self.options.bump) {
+  if (self.options.bump || self.options._.includes('bump')) {
     return bump(self);
   }
 
@@ -397,7 +410,9 @@ function _isEqual(v1, v2) {
   }
 }
 
-function _getVersion(v) {
+function _getListVersion(v) {
+  v = v.filter(i => i !== '\n');
+  v = v[v.length - 1]
   v = v.split('@');
   return v[v.length - 1]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-power-user",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "description": "Easy tools for every Node.js developer!",
   "main": "dist/index.js",
   "bin": {

package/src/index.js

@@ -24,6 +24,14 @@ const os = require('os');
 // const npm = require('npm');
 
 function Main() {
+  const self = this;
+  
+  self.options = {};
+  self.npu_packageJSON = {};
+  self.proj_path = null;
+  self.proj_packageJSONPath = null;
+  self.proj_packageJSON = {};
+  self.proj_allDependencies = {};
 
 }
 
@@ -43,8 +51,9 @@ Main.prototype.process = async function (options) {
     self.proj_path = process.cwd();
     self.proj_packageJSONPath = path.resolve(self.proj_path, './package.json');
     self.proj_packageJSON = require(self.proj_packageJSONPath);
-    self.proj_packageJSON.allDependencies = _.merge({}, self.proj_packageJSON.peerDependencies, self.proj_packageJSON.devDependencies, self.proj_packageJSON.dependencies);
-    self.proj_packageJSON.allDependenciesKeys = Object.keys(self.proj_packageJSON.allDependencies);
+    self.proj_allDependencies.pairs = _.merge({}, self.proj_packageJSON.peerDependencies, self.proj_packageJSON.devDependencies, self.proj_packageJSON.dependencies);
+    self.proj_allDependencies.list = Object.keys(self.proj_allDependencies.pairs);
+
   } catch (e) {
     self.proj_packageJSON = {
       name: 'Unknown Name',
@@ -73,29 +82,29 @@ Main.prototype.process = async function (options) {
     self.options[arg] = argv[arg]
   });
 
-  if (self.options.d || self.options.debug || process.env.NPU_LOG === 'true') {
+  if (self.options.d || self.options.debug || self.options._.includes('debug') || process.env.NPU_LOG === 'true') {
     console.log('argv', argv);
     console.log('options', self.options); 
   }
 
-  if (self.options.wait) {
+  if (self.options.wait || self.options._.includes('wait')) {
     const time = parseInt(typeof self.options.wait === 'number' ? self.options.wait : 1000);
     self.log(chalk.blue(`Waiting ${time}...`));
     await powertools.wait(time);
     self.log(chalk.green(`Done waiting`));
   }  
 
-  if (self.options.v || self.options.version) {
+  if (self.options.v || self.options.version || self.options._.includes('version')) {
     self.log(chalk.blue(`Node Power User is v${chalk.bold(self.npu_packageJSON.version)}`));
     return self.npu_packageJSON.version;
   }
 
-  if (self.options.pv || self.options.project || self.options['project-version']) {
+  if (self.options.pv || self.options.project || self.options['project-version'] || self.options._.includes('project')) {
     self.log(chalk.blue(`The current project (${chalk.bold(self.proj_packageJSON.name)}) is v${chalk.bold(self.proj_packageJSON.version)}`));
     return self.proj_packageJSON.version;
   }
 
-  if (self.options.lp || self.options.listpackages || self.options['list-packages']) {
+  if (self.options.lp || self.options.listpackages || self.options['list-packages'] || self.options._.includes('listpackages')) {
     self.log(chalk.blue.bold(`Dependencies:`));
    
     Object.keys(self.proj_packageJSON.dependencies || {})
@@ -122,7 +131,7 @@ Main.prototype.process = async function (options) {
     };
   }
 
-  if (self.options.out || self.options.outdated || self.options.match) {
+  if (self.options.out || self.options.outdated || self.options.match || self.options._.includes('out') || self.options._.includes('outdated') || self.options._.includes('match')) {
     // self.log(chalk.blue.bold(`Outdated:`));
     // self.log(chalk.green(`name: package = installed`));
 
@@ -140,22 +149,26 @@ Main.prototype.process = async function (options) {
       },
     }  
     const progress = new ProgressBar.SingleBar({}, ProgressBar.Presets.shades_classic);
-    progress.start(self.proj_packageJSON.allDependenciesKeys.length, 0);
+    progress.start(self.proj_allDependencies.list.length, 0);
 
     const response = {};
 
     let bumpCommand = '';
 
-    for (var i = 0; i < self.proj_packageJSON.allDependenciesKeys.length; i++) {
+    for (var i = 0; i < self.proj_allDependencies.list.length; i++) {
       progress.update(i);
-      const dep = self.proj_packageJSON.allDependenciesKeys[i];
-      const packageVersion = _coerce(self.proj_packageJSON.allDependencies[dep]);
+      const dep = self.proj_allDependencies.list[i];
+      const depPair = self.proj_allDependencies.pairs[dep];
+      const packageVersion = _coerce(depPair);
       const installedVersion = _coerce(
-        _getVersion(
-          (await asyncCommand(`npm list ${dep} --depth=0 | grep ${dep}`))
-            .split(' ')[1]
+        _getListVersion(
+          (await asyncCommand(`npm list ${dep} --depth=0 | grep ${dep}`)).split(' ')
         )
       );
+
+      // console.log('---', dep, depPair, _.get(packageVersion, 'version'), _.get(installedVersion, 'version'));
+
+      // console.log('---dep', dep, packageVersion, installedVersion);
       const latestVersion = await getLatestVersion(dep);
       const isEqual = _isEqual(installedVersion, packageVersion);
       const isLatest = _isEqual(packageVersion, latestVersion);
@@ -227,7 +240,7 @@ Main.prototype.process = async function (options) {
     return response;  
   }
 
-  if (self.options.global || self.options.g) {
+  if (self.options.global || self.options.g || self.options._.includes('global')) {
     const parentPath = `/Users/${os.userInfo().username}/.nvm/versions/node`;
     const versions = jetpack.list(parentPath);
     const currentNode = process.versions.node;
@@ -303,7 +316,7 @@ Main.prototype.process = async function (options) {
     return response;
   }
 
-  if (self.options.clean) {
+  if (self.options.clean || self.options._.includes('clean')) {
     const NPM_INSTALL_FLAG = self.options['no-optional'] || self.options['nooptional'] ? '--no-optional' : ''
     const NPM_CLEAN = `rm -fr node_modules && rm -fr package-lock.json && npm cache clean --force && npm install ${NPM_INSTALL_FLAG} && npm rb`;
     
@@ -318,7 +331,7 @@ Main.prototype.process = async function (options) {
     })
   }
 
-  if (self.options.bump) {
+  if (self.options.bump || self.options._.includes('bump')) {
     return bump(self);
   }
 
@@ -397,7 +410,9 @@ function _isEqual(v1, v2) {
   }
 }
 
-function _getVersion(v) {
+function _getListVersion(v) {
+  v = v.filter(i => i !== '\n');
+  v = v[v.length - 1]
   v = v.split('@');
   return v[v.length - 1]
 }