Merge 5012739 into 192f295

.eslintrc.json

@@ -0,0 +1,14 @@
+{
+  "extends": "semistandard",
+  "rules": {
+    "prefer-const": "error",
+    "block-scoped-var": "error",
+    "prefer-template": "warn",
+    "no-unneeded-ternary": "warn",
+    "no-use-before-define": [
+      "error",
+      "nofunc"
+    ]
+  }
+}
+

lib/commands/console.cmd.js

@@ -42,7 +42,7 @@ exports.builder = {
     describe: 'Will include devDependencies in output',
     default: false
   },
-  'silent': {
+  silent: {
     alias: 's',
     describe: 'Hides warning messages.',
     default: false

lib/commands/report.cmd.js

@@ -42,7 +42,7 @@ exports.builder = {
     describe: 'Will include devDependencies in HTML report',
     default: false
   },
-  'silent': {
+  silent: {
     alias: 's',
     describe: 'Hides warning messages.',
     default: false

lib/commands/save.cmd.js

@@ -53,7 +53,7 @@ exports.builder = {
     type: 'string',
     nargs: 1
   },
-  'silent': {
+  silent: {
     alias: 's',
     describe: 'Hides warning messages.',
     default: false

lib/modules/console.mdl.js

@@ -26,13 +26,22 @@ const licenseMetaData = (licenses, canonicalNameMapper, ilc, file) => {
   const licenseData = { license: [] };
   if (dual.isDual(licenses)) {
     let nameUrl = licenseNameUrl(canonicalNameMapper, dual.first(licenses));
-    licenseData.license.push({ name: nameUrl.name, url: urlValue(nameUrl, ilc, file) });
+    licenseData.license.push({
+      name: nameUrl.name,
+      url: urlValue(nameUrl, ilc, file)
+    });
 
     nameUrl = licenseNameUrl(canonicalNameMapper, dual.last(licenses));
-    licenseData.license.push({ name: nameUrl.name, url: urlValue(nameUrl, ilc, file) });
+    licenseData.license.push({
+      name: nameUrl.name,
+      url: urlValue(nameUrl, ilc, file)
+    });
   } else {
     const nameUrl = licenseNameUrl(canonicalNameMapper, licenses);
-    licenseData.license.push({ name: nameUrl.name, url: urlValue(nameUrl, ilc, file) });
+    licenseData.license.push({
+      name: nameUrl.name,
+      url: urlValue(nameUrl, ilc, file)
+    });
   }
   return licenseData;
 };
@@ -41,10 +50,12 @@ const packageMetaData = (data) => {
   const packageArray = [];
   data.forEach((d) => {
     const nv = versionHandler.fromNpmVersion(d.dependency);
-    const pkg = { packageName: nv.name,
+    const pkg = {
+      packageName: nv.name,
       version: nv.version,
       licenses: d.licenses,
-      file: d.file };
+      file: d.file
+    };
     packageArray.push(pkg);
   });
   return packageArray;

lib/utils/canonical-name.js

@@ -30,14 +30,14 @@ const map = (name) => {
 
 const init = (list) => {
   if (!list) {
-    return { 'map': (name) => name };
+    return { map: (name) => name };
   }
   for (const key in list) {
     list[key].forEach((name) => {
       namesMap.set(name, key);
     });
   }
-  return { 'map': map };
+  return { map: map };
 };
 
 const loadNameMapperFile = (nameMap) => {

lib/utils/checker.js

@@ -4,19 +4,25 @@ const licenseChecker = require('license-checker');
 
 const check = (cwd, productionOnly) => {
   return new Promise((resolve, reject) => {
-    licenseChecker.init({ start: cwd, production: productionOnly }, (error, json) => {
-      if (error) {
-        reject(error);
-      } else {
-        resolve(Object.keys(json).map((j) => {
-          json[j].dependency = j;
-          return { dependency: json[j].dependency,
-            licenses: json[j].licenses,
-            file: json[j].licenseFile
-          };
-        }));
+    licenseChecker.init(
+      { start: cwd, production: productionOnly },
+      (error, json) => {
+        if (error) {
+          reject(error);
+        } else {
+          resolve(
+            Object.keys(json).map((j) => {
+              json[j].dependency = j;
+              return {
+                dependency: json[j].dependency,
+                licenses: json[j].licenses,
+                file: json[j].licenseFile
+              };
+            })
+          );
+        }
       }
-    });
+    );
   });
 };
 

lib/utils/unified-list.js

@@ -6,10 +6,10 @@ const messages = require('./messages');
 let unifiedList;
 
 const foundInList = (license, listItem) => {
-  return (license === listItem['fedora_abbrev'] ||
-  license === listItem['fedora_name'] ||
-  license === listItem['spdx_abbrev'] ||
-  license === listItem['spdx_name']);
+  return (license === listItem.fedora_abbrev ||
+  license === listItem.fedora_name ||
+  license === listItem.spdx_abbrev ||
+  license === listItem.spdx_name);
 };
 
 const checkName = (name) => {

lib/utils/unknown.js

@@ -15,7 +15,7 @@ module.exports.check = function (project) {
     for (const idx in dep.licenses.license) {
       const l = dep.licenses.license[idx];
       if (Array.isArray(l.name)) {
-        for (var i = 0; i < l.name.length; i++) {
+        for (let i = 0; i < l.name.length; i++) {
           if (unknownCheck(l.name[i])) {
             l.name[i] = unknown;
             found = true;

lib/utils/validator.js

@@ -4,16 +4,16 @@ const Validator = require('jsonschema').Validator;
 const fileReader = require('./file-reader');
 
 const schema = {
-  'type': 'object',
-  'properties': {
-    'fedora_abbrev': { 'type': 'string' },
-    'fedora_name': { 'type': 'string' },
-    'id': { 'type': 'string' },
-    'license_text': { 'type': 'string' },
-    'approved': { 'type': 'string' },
-    'spdx_abbrev': { 'type': 'string' },
-    'spdx_name': { 'type': 'string' },
-    'url': { 'type': 'string' }
+  type: 'object',
+  properties: {
+    fedora_abbrev: { type: 'string' },
+    fedora_name: { type: 'string' },
+    id: { type: 'string' },
+    license_text: { type: 'string' },
+    approved: { type: 'string' },
+    spdx_abbrev: { type: 'string' },
+    spdx_name: { type: 'string' },
+    url: { type: 'string' }
   }
 };