Merge 739faf6 into 6dd7fb1

lib/analyzers/bower/index.js

@@ -7,6 +7,27 @@ var globby      = require( 'globby' );
 var creditUtil  = require( '../../credit' );
 var packageUtil = require( '../../package' );
 
+/**
+* Read  and evaluate dependency credits for bower module
+*
+* @param  {String} bowerJsonPath      absolute path to bower file
+* @param  {Array}  credits            list of credits to append to
+* @return {Array}                     list of credits
+*/
+function getBowerCredits( bowerJsonPath, credits ) {
+  var name = path.basename( path.dirname( bowerJsonPath ) );
+  var bowerJson = require( bowerJsonPath );
+
+  var authors = packageUtil.getAuthor( bowerJson );
+
+  if ( authors ) {
+    authors.forEach( function( author ) {
+      credits = creditUtil.addCreditToCredits( credits, author, name );
+    } );
+  }
+
+  return credits;
+}
 
 /**
 * Read project root and evaluate dependency credits for bower modules
@@ -15,26 +36,18 @@ var packageUtil = require( '../../package' );
 *
 * @return {Array}                   list of credits
 */
-function getCredits( projectPath ) {
-  var credits = [];
+function getCredits( projectPath, credits ) {
+  credits = credits || [];
 
   var depPath = path.join( projectPath, 'bower_components' );
 
   globby.sync( [ `${depPath}/*/bower.json` ] )
     .forEach( function( bowerJsonPath ) {
-      var name = path.basename( path.dirname( bowerJsonPath ) );
-      var bowerJson = require( bowerJsonPath );
-
-      var authors = packageUtil.getAuthor( bowerJson );
-
-      if ( authors ) {
-        authors.forEach( function( author ) {
-          credits = creditUtil.addCreditToCredits( credits, author, name );
-        } );
-      }
+      getBowerCredits( bowerJsonPath, credits );
     } );
 
   return credits;
 }
 
 module.exports = getCredits;
+module.exports.getBowerCredits = getBowerCredits;

lib/analyzers/jspm/index.js

@@ -6,6 +6,8 @@ var globby      = require( 'globby' );
 
 var creditUtil  = require( '../../credit' );
 var packageUtil = require( '../../package' );
+var getNpmCredits = require( '../npm' ).getNpmCredits;
+var getBowerCredits = require( '../bower' ).getBowerCredits;
 
 /**
 * Read project root and evaluate dependency credits for jspm modules
@@ -14,29 +16,17 @@ var packageUtil = require( '../../package' );
 *
 * @return {Array}              list of credits
 */
-function getCredits( projectPath ) {
-  var credits    = [];
+function getCredits( projectPath, credits ) {
+  credits    = credits || [];
+
   var jspmPath = path.join( projectPath, 'jspm_packages' );
 
-  globby.sync( [ `${jspmPath}/npm/*/package.json`, `${jspmPath}/github/*/*/package.json` ] )
+  globby.sync( [ `${jspmPath}/npm/*/package.json`, `${jspmPath}/github/*/*/{package.json,bower.json}` ] )
     .forEach( function( packagePath ) {
-      var name = path.basename( path.dirname( packagePath ) );
-
-      if ( name[ 0 ] !== '.' && name.indexOf( '.js' ) === -1 ) {
-        var packageJson = require( path.join( packagePath ) );
-        var author      = packageUtil.getAuthor( packageJson );
-        var maintainers = packageUtil.getMaintainers( packageJson );
-
-        if ( author ) {
-          credits = creditUtil.addCreditToCredits( credits, author, name );
-        }
-
-        if ( maintainers ) {
-          maintainers.forEach( function( maintainer ) {
-            credits = creditUtil.addCreditToCredits( credits, maintainer, name );
-          } );
-        }
+      if ( path.basename( packagePath ) === 'bower.json' ) {
+        return getBowerCredits( packagePath, credits );
       }
+      return getNpmCredits( packagePath, credits );
     } );
 
   return credits;

lib/analyzers/npm/index.js

@@ -7,6 +7,42 @@ var globby      = require( 'globby' );
 var creditUtil  = require( '../../credit' );
 var packageUtil = require( '../../package' );
 
+/**
+* Read  and evaluate dependency credits for npm module
+*
+* @param  {String} packagePath        absolute path to package.json file
+* @param  {Array}  credits            list of credits to append to
+* @return {Array}                     list of credits
+*/
+function getNpmCredits( packagePath, credits ) {
+  var directoryPath = path.dirname( packagePath );
+  var name = path.basename( path.dirname( packagePath ) );
+
+  if (
+    name[ 0 ] !== '.' &&
+    (
+      fs.lstatSync( directoryPath ).isDirectory() ||
+      fs.lstatSync( directoryPath ).isSymbolicLink()
+    )
+  ) {
+    var packageJson = require( packagePath );
+    var author      = packageUtil.getAuthor( packageJson );
+    var maintainers = packageUtil.getMaintainers( packageJson );
+
+    if ( author ) {
+      credits = creditUtil.addCreditToCredits( credits, author, name );
+    }
+
+    if ( maintainers ) {
+      maintainers.forEach( function( maintainer ) {
+        credits = creditUtil.addCreditToCredits( credits, maintainer, name );
+      } );
+    }
+  }
+
+  return credits;
+}
+
 /**
 * Read project root and evaluate dependency credits for node modules
 *
@@ -23,33 +59,11 @@ function getCredits( projectPath, credits ) {
 
   globby.sync( `${depPath}/**/package.json` )
     .forEach( function( packagePath ) {
-      var directoryPath = path.dirname( packagePath );
-      var name = path.basename( path.dirname( packagePath ) );
-
-      if (
-        name[ 0 ] !== '.' &&
-        (
-          fs.lstatSync( directoryPath ).isDirectory() ||
-          fs.lstatSync( directoryPath ).isSymbolicLink()
-        )
-      ) {
-        var packageJson = require( packagePath );
-        var author      = packageUtil.getAuthor( packageJson );
-        var maintainers = packageUtil.getMaintainers( packageJson );
-
-        if ( author ) {
-          credits = creditUtil.addCreditToCredits( credits, author, name );
-        }
-
-        if ( maintainers ) {
-          maintainers.forEach( function( maintainer ) {
-            credits = creditUtil.addCreditToCredits( credits, maintainer, name );
-          } );
-        }
-      }
+      getNpmCredits( packagePath, credits );
     } );
 
   return credits;
 }
 
 module.exports = getCredits;
+module.exports.getNpmCredits = getNpmCredits;

test/fixtures/bower_components/bar/bower.json

@@ -1 +1,10 @@
-{"authors":[{"name":"Alice Bobson","email":"alicebobson@alison.io"}]}
+{
+  "name": "bar",
+  "authors": [
+    {"name":"Alice Bobson","email":"alicebobson@alison.io"}
+  ],
+  "description": "",
+  "main": "",
+  "license": "MIT",
+  "private": true
+}

test/fixtures/bower_components/boom/bower.json

@@ -1 +1,8 @@
-{"note":"no authors"}
+{
+  "name": "boom",
+  "note": "no authors",
+  "description": "",
+  "main": "",
+  "license": "MIT",
+  "private": true
+}

test/fixtures/bower_components/foo/bower.json

@@ -1 +1,10 @@
-{"authors":["Bob Calsow"]}
+{
+  "name": "foo",
+  "authors": [
+    "Bob Calsow"
+  ],
+  "description": "",
+  "main": "",
+  "license": "MIT",
+  "private": true
+}

test/fixtures/jspm_packages/github/calsow/foo/bower.json

@@ -0,0 +1,10 @@
+{
+  "name": "foo",
+  "authors": [
+    "Bob Calsow"
+  ],
+  "description": "",
+  "main": "",
+  "license": "MIT",
+  "private": true
+}

test/fixtures/jspm_packages/github/components/bar/bower.json

@@ -0,0 +1,10 @@
+{
+  "name": "bar",
+  "authors": [
+    {"name":"Alice Bobson","email":"alicebobson@alison.io"}
+  ],
+  "description": "",
+  "main": "",
+  "license": "MIT",
+  "private": true
+}

test/fixtures/jspm_packages/github/components/bar/package.json

@@ -0,0 +1,12 @@
+{
+  "author": "Alice Bobson",
+  "name": "bar",
+  "version": "1.0.0",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "license": "ISC",
+  "description": ""
+}

test/fixtures/jspm_packages/npm/.cache/package.json

@@ -0,0 +1,13 @@
+{
+  "note": "this should be ignored",
+  "author": "Alice Bobson",
+  "name": "cache",
+  "version": "1.0.0",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "license": "ISC",
+  "description": ""
+}

test/fixtures/jspm_packages/npm/baz/package.json

@@ -1 +1,16 @@
-{"author":"Alice Bobson","maintainers":["Randy Ran",{"name":"Bobby Bob","email":"bobby@bob.io"}]}
+{
+  "author": "Alice Bobson",
+  "maintainers": [
+    "Randy Ran",
+    "Bobby Bob <bobby@bob.io>"
+  ],
+  "name": "baz",
+  "version": "1.0.0",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "license": "ISC",
+  "description": ""
+}

test/fixtures/jspm_packages/npm/boing/package.json

@@ -1 +1,11 @@
-{"author":"Bob Calsow <bob@calsow.io>"}
+{
+  "author": "Bob Calsow <bob@calsow.io>",
+  "name": "boing",
+  "version": "1.0.0",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "license": "ISC",
+  "description": ""
+}

test/fixtures/jspm_packages/npm/boo/package.json

@@ -1 +1,12 @@
-{"author":"Janice Robson"}
+{
+  "author": "Janice Robson",
+  "name": "boo",
+  "version": "1.0.0",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "license": "ISC",
+  "description": ""
+}

test/fixtures/linked/package.json

@@ -1 +1,11 @@
-{"author":"Bob Loblaw"}
+{
+  "author": "Bob Loblaw",
+  "name": "linked",
+  "version": "1.0.0",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "license": "ISC",
+  "description": ""
+}