Skip to content

Expose raw license details #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Expose raw license details #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1e3dbc
Expose raw license details
Jan 3, 2019
748dda6
Update test to omit licensesRaw field
Jan 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ module.exports = function checkPath (packageName, basePath, overrides, includeDe
}
}

var licensesRaw = []
var license = 'unknown'
var licenseFilePath

Expand All @@ -242,15 +243,17 @@ module.exports = function checkPath (packageName, basePath, overrides, includeDe
} else if (packageJson.license) {
licenses.push(packageJson.license)
}
license = licenses.map(getJsonLicense).map(formatLicense).join(', ')
licensesRaw = licenses.map(getJsonLicense)
license = licensesRaw.map(formatLicense).join(', ')
} else {
// Look for file with "license" or "copying" in its name
var files = fs.readdirSync(basePath)
files.some(function (name) {
if (/licen[sc]e/i.test(name) || /copying.*/i.test(name)) {
var file = path.join(basePath, name)
if (fs.statSync(file).isFile()) {
license = formatLicense(getFileLicense(file))
licensesRaw = [getFileLicense(file)]
license = formatLicense(licensesRaw[0])
licenseFilePath = file
return true
}
Expand All @@ -265,6 +268,7 @@ module.exports = function checkPath (packageName, basePath, overrides, includeDe
if (fs.statSync(file).isFile()) {
var result = getReadmeLicense(file)
if (result) {
licensesRaw = [result]
license = formatLicense(result)
licenseFilePath = file
return license !== 'nomatch'
Expand Down Expand Up @@ -303,6 +307,7 @@ module.exports = function checkPath (packageName, basePath, overrides, includeDe
name: packageJson.name,
version: packageJson.version,
license: license,
licensesRaw: licensesRaw,
licenseFile: licenseFilePath && path.relative(process.cwd(), licenseFilePath),
deps: dependencies.sort(function (dep1, dep2) { return dep1.name.localeCompare(dep2.name) })
}
Expand Down
1 change: 1 addition & 0 deletions test/licensecheck.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ suite('licensecheck')

function replacer (key, value) {
switch (key) {
case 'licensesRaw':
case 'licenseFile':
case 'version':
return undefined
Expand Down