Fixes #49: Default to unknown if licenses null and added ISC support

davglass · Oct 20, 2015 · 981eeda · 981eeda
1 parent ba946dd
commit 981eeda
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 0 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -162,6 +162,14 @@ exports.init = function(options, callback) {
             inputError = null;
 
         Object.keys(data).sort().forEach(function(item) {
+            if (!data[item].licenses) {
+                /*istanbul ignore else*/
+                if (colorize) {
+                    data[item].licenses = chalk.bold.red(UNKNOWN);
+                } else {
+                    data[item].licenses = UNKNOWN;
+                }
+            }
             if (options.unknown) {
                 if (data[item].licenses && data[item].licenses !== UNKNOWN) {
                     if (data[item].licenses.indexOf('*') > -1) {

diff --git a/lib/license.js b/lib/license.js
@@ -1,8 +1,10 @@
 var MIT_LICENSE = /ermission is hereby granted, free of charge, to any/;
 var BSD_LICENSE = /edistribution and use in source and binary forms, with or withou/;
 var WTFPL_LICENSE = /DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE/;
+var ISC_LICENSE = /The ISC License/;
 var MIT = /MIT\b/;
 var BSD = /BSD\b/;
+var ISC = /ISC\b/;
 var APACHE = /Apache License\b/;
 var WTFPL = /WTFPL\b/;
 
@@ -13,12 +15,16 @@ module.exports = function(str) {
     }
     if (typeof str === 'undefined' || !str) {
         return 'Undefined';
+    } else if (ISC_LICENSE.test(str)) {
+        return 'ISC*';
     } else if (MIT_LICENSE.test(str)) {
         return 'MIT*';
     } else if (BSD_LICENSE.test(str)) {
         return 'BSD*';
     } else if (WTFPL_LICENSE.test(str)) {
         return 'WTFPL*';
+    } else if (ISC.test(str)) {
+        return 'ISC*';
     } else if (MIT.test(str)) {
         return 'MIT*';
     } else if (BSD.test(str)) {

diff --git a/tests/license.js b/tests/license.js
@@ -75,6 +75,22 @@ var tests = {
             assert.equal(data, 'WTFPL*');
         }
     },
+    'ISC check': {
+        topic: function() {
+            return license('asdfasdf\nThe ISC License\nasdfasdf');
+        },
+        'should return ISC': function(data) {
+            assert.equal(data, 'ISC*');
+        }
+    },
+    'ISC word check': {
+        topic: function() {
+            return license('asdf\nasdf\nISC\nasdf\n');
+        },
+        'should return ISC': function(data) {
+            assert.equal(data, 'ISC*');
+        }
+    },
     'Check for null': {
         topic: function() {
             return license('this is empty, hi');