New Version: Update dependencies

RSeidelsohn · Apr 21, 2021 · 06c5c4f · 06c5c4f
2 parents 3733187 + 01c804e
commit 06c5c4f
Show file tree

Hide file tree

Showing 6 changed files with 108 additions and 119 deletions.
diff --git a/bin/license-checker-rseidelsohn b/bin/license-checker-rseidelsohn
@@ -68,7 +68,7 @@ if (hasFailingArg && hasFailingArg.indexOf(',') >= 0) {
 }
 
 licenseChecker.init(args, function(err, json) {
-    if (Boolean(err)) {
+    if (err) {
         console.error('An error has occurred:');
         console.error(err);
     }
@@ -115,7 +115,7 @@ function getFormattedOutput(json, args) {
     }
 
     if (args.markdown){
-        return licenseChecker.asMarkDown(json, args.customFormat) + '\n';
+        return licenseChecker.asMarkDown(json, args.customFormat) + "\n";
     }
 
     if (args.summary) {

diff --git a/lib/index.js b/lib/index.js
@@ -379,7 +379,7 @@ exports.init = function init(args, callback) {
                 if (
                     whitelist.findIndex((whitelistPackage) => {
                         return filteredPackage.startsWith(
-                            whitelistPackage.indexOf('@') > 0 ? whitelistPackage : whitelistPackage + '@',
+                            whitelistPackage.lastIndexOf('@') > 0 ? whitelistPackage : whitelistPackage + '@',
                         );
                     }) !== -1
                 ) {
@@ -401,7 +401,7 @@ exports.init = function init(args, callback) {
                 if (
                     blacklist.findIndex((blacklistPackage) => {
                         return filteredPackage.startsWith(
-                            blacklistPackage.indexOf('@') > 0 ? blacklistPackage : blacklistPackage + '@',
+                            blacklistPackage.lastIndexOf('@') > 0 ? blacklistPackage : blacklistPackage + '@',
                         );
                     }) === -1
                 ) {

diff --git a/package.json b/package.json
@@ -2,10 +2,11 @@
     "name": "license-checker-rseidelsohn",
     "description": "Feature enhanced version of the original license-checker v25.0.1",
     "author": "Roman Seidelsohn <rseidelsohn@gmail.com>",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "contributors": [
         "Adam Weber <adamweber01@gmail.com>",
         "Andrew Couch <andy@couchand.com>",
+        "Andrii Kostenko <andrey@kostenko.name>",
         "Asharma <Asharma@agtinternational.com>",
         "Bryan English <bryan@bryanenglish.com>",
         "Christoph Werner <christoph@codepunkt.de>",
@@ -52,6 +53,7 @@
         "Yuri Zapuchlak <yuri@vidmaker.com>",
         "badunk <baduncaduncan@gmail.com>",
         "creising <creising@gmail.com>",
+        "dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>",
         "gdw2 <gdwarner@Gmail.com>",
         "ktmouk <ktmouk@gmail.com>",
         "santiagocanti <santiago.canti@auth0.com>",

diff --git a/tests/packages-test.js b/tests/packages-test.js
@@ -6,7 +6,7 @@ describe('bin/license-checker-rseidelsohn', function() {
     this.timeout(8000);
 
     it('should restrict the output to the provided packages', function() {
-        var restrictedPackages = ['nopt@5.0.0'];
+        var restrictedPackages = ['@types/node@14.14.41'];
         var output = spawn(
             'node',
             [
@@ -24,7 +24,7 @@ describe('bin/license-checker-rseidelsohn', function() {
     });
 
     it('should exclude provided excludedPackages from the output', function() {
-        var excludedPackages = ['readable-stream@1.1.14', 'spdx-satisfies@4.0.0', 'y18n@3.2.1'];
+        var excludedPackages = ['@types/node@14.14.41', 'spdx-satisfies@4.0.0', 'y18n@3.2.1'];
         var output = spawn(
             'node',
             [

diff --git a/tests/test.js b/tests/test.js
@@ -813,7 +813,7 @@ describe('main tests', function() {
             );
 
             files = fs.readdirSync(out);
-            assert.equal('foo-LICENSE.txt', files[0]);
+            assert.equal(files[0], 'foo-LICENSE.txt');
             require('rimraf').sync(out);
         });
     });