read-package-json@1.1.8

10 files changed, 100 insertions, 14 deletions

diff --git a/node_modules/read-package-json/node_modules/normalize-package-data/lib/fixer.js b/node_modules/read-package-json/node_modules/normalize-package-data/lib/fixer.js
index 9d832ee17..3414c0932 100644
--- a/node_modules/read-package-json/node_modules/normalize-package-data/lib/fixer.js
+++ b/node_modules/read-package-json/node_modules/normalize-package-data/lib/fixer.js
@@ -110,7 +110,7 @@ var fixer = module.exports = {
     } else if (data[bd]) {
       data[bd] = data[bd].filter(function(bd) {
         if (!bd || typeof bd !== 'string') {
-          this.warn(format(nonStringBundleDependency, bd))
+          this.warn(format(warningMessages.nonStringBundleDependency, bd))
           return false
         } else {
           return true
@@ -135,7 +135,7 @@ var fixer = module.exports = {
       Object.keys(data[deps]).forEach(function (d) {
         var r = data[deps][d]
         if (typeof r !== 'string') {
-          this.warn(format(nonStringDependency, d, JSON.stringify(r)))
+          this.warn(format(warningMessages.nonStringDependency, d, JSON.stringify(r)))
           delete data[deps][d]
         }
         // "/" is not allowed as packagename for publishing, but for git-urls
diff --git a/node_modules/read-package-json/node_modules/normalize-package-data/package.json b/node_modules/read-package-json/node_modules/normalize-package-data/package.json
index 05037bf92..cee907988 100644
--- a/node_modules/read-package-json/node_modules/normalize-package-data/package.json
+++ b/node_modules/read-package-json/node_modules/normalize-package-data/package.json
@@ -1,6 +1,6 @@
 {
   "name": "normalize-package-data",
-  "version": "0.2.9",
+  "version": "0.2.12",
   "author": {
     "name": "Meryn Stol",
     "email": "merynstol@gmail.com"
@@ -44,10 +44,6 @@
     "url": "https://github.com/meryn/normalize-package-data/issues"
   },
   "homepage": "https://github.com/meryn/normalize-package-data",
-  "_id": "normalize-package-data@0.2.9",
-  "dist": {
-    "shasum": "73fff1f896ce6f95bd089c57037a96389ad5789e"
-  },
-  "_from": "normalize-package-data@~0.2.9",
-  "_resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.9.tgz"
+  "_id": "normalize-package-data@0.2.12",
+  "_from": "normalize-package-data@~0.2.9"
 }
diff --git a/node_modules/read-package-json/node_modules/normalize-package-data/test/dependencies.js b/node_modules/read-package-json/node_modules/normalize-package-data/test/dependencies.js
new file mode 100644
index 000000000..dda24dc4f
--- /dev/null
+++ b/node_modules/read-package-json/node_modules/normalize-package-data/test/dependencies.js
@@ -0,0 +1,43 @@
+var tap = require("tap")
+var normalize = require("../lib/normalize")
+
+var warningMessages = require("../lib/warning_messages.json")
+var safeFormat = require("../lib/safe_format")
+
+tap.test("warn if dependency contains anything else but a string", function(t) {
+  var a
+  var warnings = []
+  function warn(w) {
+    warnings.push(w)
+  }
+  normalize(a={
+    dependencies: { "a": 123},
+    devDependencies: { "b": 456},
+    optionalDependencies: { "c": 789}
+  }, warn)
+  
+  var wanted1 = safeFormat(warningMessages.nonStringDependency, "a", 123)
+  var wanted2 = safeFormat(warningMessages.nonStringDependency, "b", 456)
+  var wanted3 = safeFormat(warningMessages.nonStringDependency, "c", 789)
+  t.ok(~warnings.indexOf(wanted1), wanted1)
+  t.ok(~warnings.indexOf(wanted2), wanted2)
+  t.ok(~warnings.indexOf(wanted3), wanted3)
+  t.end()
+})
+
+tap.test("warn if bundleDependencies array contains anything else but strings", function(t) {
+  var a
+  var warnings = []
+  function warn(w) {
+    warnings.push(w)
+  }
+  normalize(a={
+    bundleDependencies: ["abc", 123, {foo:"bar"}]
+  }, warn)
+  
+  var wanted1 = safeFormat(warningMessages.nonStringBundleDependency, 123)
+  var wanted2 = safeFormat(warningMessages.nonStringBundleDependency, {foo:"bar"})
+  t.ok(~warnings.indexOf(wanted1), wanted1)
+  t.ok(~warnings.indexOf(wanted2), wanted2)
+  t.end()
+})
\ No newline at end of file
diff --git a/node_modules/read-package-json/package.json b/node_modules/read-package-json/package.json
index 794aedb8e..a2eb414c0 100644
--- a/node_modules/read-package-json/package.json
+++ b/node_modules/read-package-json/package.json
@@ -1,6 +1,6 @@
 {
   "name": "read-package-json",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
@@ -34,6 +34,6 @@
     "url": "https://github.com/isaacs/read-package-json/issues"
   },
   "homepage": "https://github.com/isaacs/read-package-json",
-  "_id": "read-package-json@1.1.7",
-  "_from": "read-package-json@~1.1.6"
+  "_id": "read-package-json@1.1.8",
+  "_from": "read-package-json@latest"
 }
diff --git a/node_modules/read-package-json/read-json.js b/node_modules/read-package-json/read-json.js
index 5f69c0dcf..acb7d62d8 100644
--- a/node_modules/read-package-json/read-json.js
+++ b/node_modules/read-package-json/read-json.js
@@ -231,17 +231,31 @@ function readme (file, data, cb) {
                 if (data.readme) return cb(null, data);
                 var dir = path.dirname(file)
                 var globOpts = { cwd: dir, nocase: true, mark: true }
-                glob("README?(.*)", globOpts, function (er, files) {
+                glob("{README,README.*}", globOpts, function (er, files) {
                                 if (er) return cb(er);
                                 // don't accept directories.
                                 files = files.filter(function (file) {
                                                 return !file.match(/\/$/)
                                 })
                                 if (!files.length) return cb();
-                                var rm = path.resolve(dir, files[0])
+                                var fn = preferMarkdownReadme(files)
+                                var rm = path.resolve(dir, fn)
                                 readme_(file, data, rm, cb)
                 })
 }
+function preferMarkdownReadme(files) {
+                var fallback = 0;
+                var re = /\.m?a?r?k?d?o?w?n?$/i
+                for (var i = 0; i < files.length; i++) {
+                                if (files[i].match(re))
+                                                return files[i]
+                                else if (files[i].match(/README$/))
+                                                fallback = i
+                }
+                // prefer README.md, followed by README; otherwise, return
+                // the first filename (which could be README)
+                return files[fallback];
+}
 function readme_(file, data, rm, cb) {
                 var rmfn = path.basename(rm);
                 fs.readFile(rm, "utf8", function (er, rm) {
diff --git a/node_modules/read-package-json/test/fixtures/readmes/README b/node_modules/read-package-json/test/fixtures/readmes/README
new file mode 100644
index 000000000..257cc5642
--- /dev/null
+++ b/node_modules/read-package-json/test/fixtures/readmes/README
@@ -0,0 +1 @@
+foo
diff --git a/node_modules/read-package-json/test/fixtures/readmes/README.md b/node_modules/read-package-json/test/fixtures/readmes/README.md
new file mode 100644
index 000000000..e444c2f0f
--- /dev/null
+++ b/node_modules/read-package-json/test/fixtures/readmes/README.md
@@ -0,0 +1 @@
+*markdown*
diff --git a/node_modules/read-package-json/test/fixtures/readmes/package.json b/node_modules/read-package-json/test/fixtures/readmes/package.json
new file mode 100644
index 000000000..b0c1a318a
--- /dev/null
+++ b/node_modules/read-package-json/test/fixtures/readmes/package.json
@@ -0,0 +1 @@
+{"name":"readmes", "version":"99.999.999999999"}
diff --git a/node_modules/read-package-json/test/fixtures/readmes/readmexxx.yz b/node_modules/read-package-json/test/fixtures/readmes/readmexxx.yz
new file mode 100644
index 000000000..662da9128
--- /dev/null
+++ b/node_modules/read-package-json/test/fixtures/readmes/readmexxx.yz
@@ -0,0 +1 @@
+extra noise
diff --git a/node_modules/read-package-json/test/readmes.js b/node_modules/read-package-json/test/readmes.js
new file mode 100644
index 000000000..1c1cee1b3
--- /dev/null
+++ b/node_modules/read-package-json/test/readmes.js
@@ -0,0 +1,29 @@
+// vim: set softtabstop=16 shiftwidth=16:
+var tap = require("tap")
+var readJson = require("../")
+var path = require("path")
+var fs = require("fs")
+var p = path.resolve(__dirname, "fixtures/readmes/package.json")
+
+var expect = {}
+var expect = {
+  "name" : "readmes",
+  "version" : "99.999.999999999",
+  "readme" : "*markdown*\n",
+  "readmeFilename" : "README.md",
+  "description" : "*markdown*",
+  "_id" : "readmes@99.999.999999999"
+}
+
+console.error("readme test")
+tap.test("readme test", function (t) {
+                readJson(p, function (er, data) {
+                                if (er) throw er;
+                                test(t, data)
+                })
+})
+
+function test(t, data) {
+                t.deepEqual(data, expect)
+                t.end()
+}