Merge 03adfbd into dc6ed4a

stefanjudis · Oct 12, 2017 · 5194766 · 5194766
2 parents dc6ed4a + 03adfbd
commit 5194766
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/lib/analyzers/bower/index.js b/lib/analyzers/bower/index.js
@@ -14,9 +14,8 @@ const packageUtil = require('../../package');
 * @return {Array}                     list of credits
 */
 function getBowerCredits(bowerJsonPath, credits) {
-	const name = path.basename(path.dirname(bowerJsonPath));
 	const bowerJson = packageUtil.readJSONSync(bowerJsonPath);
-
+	const name = bowerJson.name || path.basename(path.dirname(bowerJsonPath));
 	const authors = packageUtil.getAuthor(bowerJson);
 
 	if (authors) {

diff --git a/lib/analyzers/npm/index.js b/lib/analyzers/npm/index.js
@@ -16,7 +16,7 @@ const packageUtil = require('../../package');
 */
 function getNpmCredits(packagePath, credits) {
 	const directoryPath = path.dirname(packagePath);
-	const name = path.basename(path.dirname(packagePath));
+	let name = path.basename(path.dirname(packagePath));
 
 	if (
     name[0] !== '.' &&
@@ -26,6 +26,7 @@ function getNpmCredits(packagePath, credits) {
     )
   ) {
 		const packageJson = packageUtil.readJSONSync(packagePath);
+		name = packageJson.name || name;
 
 		const author = packageUtil.getAuthor(packageJson);
 		const maintainers = packageUtil.getMaintainers(packageJson);

diff --git a/test/fixtures/node_modules/baz/package.json b/test/fixtures/node_modules/baz/package.json
diff --git a/test/index.spec.js b/test/index.spec.js
@@ -8,10 +8,10 @@ import credits from '../';
 const fixtures = path.resolve( './fixtures' );
 
 test( 'credits - folder exists', t => {
-    return credits( fixtures )
+  return credits( fixtures )
       .then( credits => {
         t.deepEqual( credits.npm[ 0 ].name, 'Alice Bobson' );
-        t.deepEqual( credits.npm[ 0 ].packages.sort(), ['bar', 'baz', 'boom'] );
+        t.deepEqual( credits.npm[ 0 ].packages.sort(), [ 'bar', 'boom', 'boz' ] );
       } );
 } );
 

diff --git a/test/npm.spec.js b/test/npm.spec.js
@@ -14,16 +14,16 @@ test( 'getCredits - get available npm credits', t => {
   const credits = getCredits( fixtures );
 
   t.deepEqual( credits[ 0 ].name, 'Alice Bobson' );
-  t.deepEqual( credits[ 0 ].packages.sort(), [ 'bar', 'baz', 'boom' ] );
+  t.deepEqual( credits[ 0 ].packages.sort(), [ 'bar', 'boom', 'boz' ] );
 
   t.deepEqual( credits[ 1 ].name, 'Bob Calsow' );
   t.deepEqual( credits[ 1 ].packages.sort(), [ 'boing', 'foo' ] );
 
   t.deepEqual( credits[ 2 ].name, 'Randy Ran' );
-  t.deepEqual( credits[ 2 ].packages, [ 'baz' ] );
+  t.deepEqual( credits[ 2 ].packages, [ 'boz' ] );
 
   t.deepEqual( credits[ 3 ].name, 'Bobby Bob' );
-  t.deepEqual( credits[ 3 ].packages, [ 'baz' ] );
+  t.deepEqual( credits[ 3 ].packages, [ 'boz' ] );
 
   t.deepEqual( credits[ 4 ].name, 'Bob Loblaw' );
   t.deepEqual( credits[ 4 ].packages.sort(), [ 'cycle', 'linked' ] );