Hello community,
here is the log from the commit of package nodejs-normalize-package-data for
openSUSE:Factory checked in at 2015-08-05 06:51:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nodejs-normalize-package-data (Old)
and /work/SRC/openSUSE:Factory/.nodejs-normalize-package-data.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nodejs-normalize-package-data"
Changes:
--------
---
/work/SRC/openSUSE:Factory/nodejs-normalize-package-data/nodejs-normalize-package-data.changes
2015-07-02 22:39:22.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.nodejs-normalize-package-data.new/nodejs-normalize-package-data.changes
2015-08-05 06:51:14.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Jul 29 13:42:12 UTC 2015 - [email protected]
+
+- update version 2.3.1
+
+-------------------------------------------------------------------
Old:
----
normalize-package-data-2.2.0.tgz
New:
----
normalize-package-data-2.3.1.tgz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nodejs-normalize-package-data.spec ++++++
--- /var/tmp/diff_new_pack.LJe0D4/_old 2015-08-05 06:51:15.000000000 +0200
+++ /var/tmp/diff_new_pack.LJe0D4/_new 2015-08-05 06:51:15.000000000 +0200
@@ -19,7 +19,7 @@
%define base_name normalize-package-data
Name: nodejs-normalize-package-data
-Version: 2.2.0
+Version: 2.3.1
Release: 0
Summary: Normalizes data that can be found in package.json files
License: BSD-2-Clause
++++++ normalize-package-data-2.2.0.tgz -> normalize-package-data-2.3.1.tgz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/package/README.md new/package/README.md
--- old/package/README.md 2015-05-22 01:32:48.000000000 +0200
+++ new/package/README.md 2015-06-19 10:17:38.000000000 +0200
@@ -95,7 +95,7 @@
### Rules for license field
-The `license` field should be a valid *SDPDX license expression* string, as
determined by the `spdx.valid` method. See [documentation for the spdx
module](https://github.com/kemitchell/spdx.js).
+The `license` field should be a valid *SDPDX license expression* or one of the
special values allowed by
[validate-npm-package-license](https://npmjs.com/packages/validate-npm-package-license).
See [documentation for the license field in
package.json](https://docs.npmjs.com/files/package.json#license).
## Credits
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/package/lib/fixer.js new/package/lib/fixer.js
--- old/package/lib/fixer.js 2015-05-22 01:32:48.000000000 +0200
+++ new/package/lib/fixer.js 2015-06-19 10:17:38.000000000 +0200
@@ -1,5 +1,5 @@
var semver = require("semver")
-var spdx = require('spdx');
+var validateLicense = require('validate-npm-package-license');
var hostedGitInfo = require("hosted-git-info")
var depTypes = ["dependencies","devDependencies","optionalDependencies"]
var extractDescription = require("./extract_description")
@@ -50,6 +50,7 @@
if (typeof data.scripts !== "object") {
this.warn("nonObjectScripts")
delete data.scripts
+ return
}
Object.keys(data.scripts).forEach(function (k) {
if (typeof data.scripts[k] !== "string") {
@@ -291,12 +292,16 @@
, fixLicenseField: function(data) {
if (!data.license) {
return this.warn("missingLicense")
- } else if (
- typeof(data.license) !== 'string' ||
- data.license.length < 1 ||
- !spdx.valid(data.license)
- ) {
- this.warn("nonSPDXLicense")
+ } else{
+ if (
+ typeof(data.license) !== 'string' ||
+ data.license.length < 1
+ ) {
+ this.warn("invalidLicense")
+ } else {
+ if (!validateLicense(data.license).validForNewPackages)
+ this.warn("invalidLicense")
+ }
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/package/lib/warning_messages.json
new/package/lib/warning_messages.json
--- old/package/lib/warning_messages.json 2015-05-22 01:32:48.000000000
+0200
+++ new/package/lib/warning_messages.json 2015-06-19 10:17:38.000000000
+0200
@@ -25,7 +25,7 @@
,"nonEmailBugsEmailField": "bugs.email field must be a string email.
Deleted."
,"emptyNormalizedBugs": "Normalized value of bugs field is an empty object.
Deleted."
,"nonUrlHomepage": "homepage field must be a string url. Deleted."
- ,"nonSPDXLicense": "license should be a valid SPDX license expression"
+ ,"invalidLicense": "license should be a valid SPDX license expression"
,"missingProtocolHomepage": "homepage field must start with a protocol."
,"typo": "%s should probably be %s."
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/package/package.json new/package/package.json
--- old/package/package.json 2015-05-22 01:43:21.000000000 +0200
+++ new/package/package.json 2015-07-17 01:41:39.000000000 +0200
@@ -1,6 +1,6 @@
{
"name": "normalize-package-data",
- "version": "2.2.0",
+ "version": "2.3.1",
"author": "Meryn Stol <[email protected]>",
"description": "Normalizes data that can be found in package.json files.",
"license": "BSD-2-Clause",
@@ -14,12 +14,12 @@
},
"dependencies": {
"hosted-git-info": "^2.0.2",
- "semver": "2 || 3 || 4",
- "spdx": "^0.4.0"
+ "semver": "2 || 3 || 4 || 5",
+ "validate-npm-package-license": "^2.0.0"
},
"devDependencies": {
- "tap": "~0.2.5",
- "underscore": "~1.4.4",
- "async": "~0.9.0"
+ "async": "~0.9.0",
+ "tap": "^1.1.0",
+ "underscore": "~1.4.4"
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/package/test/fixtures/badscripts.json
new/package/test/fixtures/badscripts.json
--- old/package/test/fixtures/badscripts.json 1970-01-01 01:00:00.000000000
+0100
+++ new/package/test/fixtures/badscripts.json 2015-06-19 03:17:52.000000000
+0200
@@ -0,0 +1,5 @@
+{
+ "name": "bad-scripts-package",
+ "version": "0.0.1",
+ "scripts": "foo"
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/package/test/normalize.js
new/package/test/normalize.js
--- old/package/test/normalize.js 2015-05-22 01:32:48.000000000 +0200
+++ new/package/test/normalize.js 2015-06-19 10:17:38.000000000 +0200
@@ -160,7 +160,7 @@
[ warningMessages.missingDescription,
warningMessages.missingRepository,
warningMessages.missingReadme,
- warningMessages.nonSPDXLicense]
+ warningMessages.invalidLicense]
t.same(warnings, expect)
t.end()
})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/package/test/scripts.js new/package/test/scripts.js
--- old/package/test/scripts.js 1970-01-01 01:00:00.000000000 +0100
+++ new/package/test/scripts.js 2015-06-19 03:17:52.000000000 +0200
@@ -0,0 +1,24 @@
+var tap = require("tap")
+var normalize = require("../lib/normalize")
+var path = require("path")
+var fs = require("fs")
+
+tap.test("bad scripts", function (t) {
+ var p = path.resolve(__dirname, "./fixtures/badscripts.json")
+ fs.readFile (p, function (err, contents) {
+ if (err) throw err
+ var originalData = JSON.parse(contents.toString())
+ var data = JSON.parse(contents.toString())
+ normalize(data)
+ t.ok(data)
+ verifyFields(t, data, originalData)
+ t.end()
+ })
+})
+
+function verifyFields (t, normalized, original) {
+ t.equal(normalized.version, original.version, "Version field stays same")
+ t.equal(normalized.name, original.name, "Name stays the same.")
+ // scripts is not an object, so it should be deleted
+ t.notOk(normalized.scripts)
+}
