diff --git a/licensor b/licensor index eddf8ea..422ff30 100755 --- a/licensor +++ b/licensor @@ -136,7 +136,10 @@ function fieldFromPackage(field, package/*, defaultValue */) { else if (field === 'name') { return package.name } else if (field === 'owners') { - return package.author.name } + return ( + package.author.hasOwnProperty('for') ? + package.author.for : + package.author.name ) } else if (field === 'year') { return new Date() .getFullYear() diff --git a/tests/bsd-3-clause-work-for-hire/package.json b/tests/bsd-3-clause-work-for-hire/package.json new file mode 100644 index 0000000..e4b6d54 --- /dev/null +++ b/tests/bsd-3-clause-work-for-hire/package.json @@ -0,0 +1,4 @@ +{ + "author": "John Doe [SomeCo, Inc.]", + "license": "BSD-3-Clause" +} diff --git a/tests/bsd-3-clause-work-for-hire/test.js b/tests/bsd-3-clause-work-for-hire/test.js new file mode 100644 index 0000000..bc378ca --- /dev/null +++ b/tests/bsd-3-clause-work-for-hire/test.js @@ -0,0 +1,49 @@ +var tap = require('tap') +var fs = require('fs') +var path = require('path') + +tap.equal(require('../run')([ '--width=50' ], __dirname).status, 0) + +tap.equal( + fs.readFileSync(path.join(__dirname, 'LICENSE')).toString(), + [ 'Copyright (c) 2016, SomeCo, Inc.', + '', + 'All rights reserved.', + '', + 'Redistribution and use in source and binary forms,', + 'with or without modification, are permitted', + 'provided that the following conditions are met:', + '', + '1. Redistributions of source code must retain the', + 'above copyright notice, this list of conditions', + 'and the following disclaimer.', + '', + '2. Redistributions in binary form must reproduce', + 'the above copyright notice, this list of', + 'conditions and the following disclaimer in the', + 'documentation and/or other materials provided with', + 'the distribution.', + '', + '3. Neither the name of undefined nor the names of', + 'its contributors may be used to endorse or promote', + 'products derived from this software without', + 'specific prior written permission.', + '', + 'THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS', + 'AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR', + 'IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,', + 'THE IMPLIED WARRANTIES OF MERCHANTABILITY AND', + 'FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.', + 'IN NO EVENT SHALL THE COPYRIGHT HOLDER OR', + 'CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,', + 'INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL', + 'DAMAGES (INCLUDING, BUT NOT LIMITED TO,', + 'PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS', + 'OF USE, DATA, OR PROFITS; OR BUSINESS', + 'INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF', + 'LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,', + 'OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)', + 'ARISING IN ANY WAY OUT OF THE USE OF THIS', + 'SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF', + 'SUCH DAMAGE.' ] + .join('\n'))