diff options
author | isaacs <i@izs.me> | 2014-02-16 20:43:16 -0800 |
---|---|---|
committer | isaacs <i@izs.me> | 2014-02-16 20:43:16 -0800 |
commit | ec2fc4ca4d3eacaa3dc1db1673169b89233b9823 (patch) | |
tree | 0aa8a647e5111653bdf9c122182be93bf8823c7b /deps/npm/node_modules/npm-registry-client/lib | |
parent | 86b8d84811484763b251b9a8a2b9e673964ea6b5 (diff) | |
download | node-npm-v1.4.3.tar.gz |
npm: upgrade to 1.4.3npm-v1.4.3
Diffstat (limited to 'deps/npm/node_modules/npm-registry-client/lib')
6 files changed, 17 insertions, 8 deletions
diff --git a/deps/npm/node_modules/npm-registry-client/lib/adduser.js b/deps/npm/node_modules/npm-registry-client/lib/adduser.js index 2684063cc..aebf71d67 100644 --- a/deps/npm/node_modules/npm-registry-client/lib/adduser.js +++ b/deps/npm/node_modules/npm-registry-client/lib/adduser.js @@ -81,7 +81,8 @@ function adduser (username, password, email, cb) { this.log.verbose("adduser", "update existing user") return this.request('GET' - , '/-/user/org.couchdb.user:'+encodeURIComponent(username) + , '/-/user/org.couchdb.user:'+encodeURIComponent(username) + + '?write=true' , function (er, data, json, response) { if (er || data.error) { return cb(er, data, json, response) diff --git a/deps/npm/node_modules/npm-registry-client/lib/deprecate.js b/deps/npm/node_modules/npm-registry-client/lib/deprecate.js index 221e8adf4..4a2f9af24 100644 --- a/deps/npm/node_modules/npm-registry-client/lib/deprecate.js +++ b/deps/npm/node_modules/npm-registry-client/lib/deprecate.js @@ -14,7 +14,7 @@ function deprecate (name, ver, message, cb) { var users = {} - this.get(name, function (er, data) { + this.get(name + '?write=true', function (er, data) { if (er) return cb(er) // filter all the versions that match Object.keys(data.versions).filter(function (v) { diff --git a/deps/npm/node_modules/npm-registry-client/lib/get.js b/deps/npm/node_modules/npm-registry-client/lib/get.js index eeb716e85..bb6d525b8 100644 --- a/deps/npm/node_modules/npm-registry-client/lib/get.js +++ b/deps/npm/node_modules/npm-registry-client/lib/get.js @@ -31,9 +31,15 @@ function get (uri, timeout, nofollow, staleOk, cb) { var cacheUri = uri // on windows ":" is not an allowed character in a foldername - cacheUri = cacheUri.replace(/:/g, '_') + cacheUri = cacheUri.replace(/:/g, '_').replace(/\?write=true$/, '') var cache = path.join(this.conf.get('cache'), cacheUri, ".cache.json") + // If the GET is part of a write operation (PUT or DELETE), then + // skip past the cache entirely, but still save the results. + if (uri.match(/\?write=true$/)) + return get_.call(this, uri, timeout, cache, null, null, nofollow, staleOk, cb) + + fs.stat(cache, function (er, stat) { if (!er) fs.readFile(cache, function (er, data) { try { data = JSON.parse(data) } diff --git a/deps/npm/node_modules/npm-registry-client/lib/publish.js b/deps/npm/node_modules/npm-registry-client/lib/publish.js index acc0ca81c..d6525eb78 100644 --- a/deps/npm/node_modules/npm-registry-client/lib/publish.js +++ b/deps/npm/node_modules/npm-registry-client/lib/publish.js @@ -18,8 +18,8 @@ function publish (data, tarball, cb) { return cb(er) } - if (data.name !== encodeURIComponent(data.name).toLowerCase()) - return cb(new Error('invalid name: must be lowercase and url-safe')) + if (data.name !== encodeURIComponent(data.name)) + return cb(new Error('invalid name: must be url-safe')) var ver = semver.clean(data.version) if (!ver) @@ -95,7 +95,8 @@ function putFirst (data, tardata, stat, username, email, cb) { return cb(er, parsed, json, res) // let's see what versions are already published. - this.request("GET", data.name, function (er, current) { + var getUrl = data.name + "?write=true" + this.request("GET", getUrl, function (er, current) { if (er) return cb(er) putNext.call(this, data.version, root, current, cb) diff --git a/deps/npm/node_modules/npm-registry-client/lib/star.js b/deps/npm/node_modules/npm-registry-client/lib/star.js index 5b7ab4afe..5c2375d04 100644 --- a/deps/npm/node_modules/npm-registry-client/lib/star.js +++ b/deps/npm/node_modules/npm-registry-client/lib/star.js @@ -7,7 +7,7 @@ function star (package, starred, cb) { var users = {} - this.request("GET", package, function (er, fullData) { + this.request("GET", package + '?write=true', function (er, fullData) { if (er) return cb(er) fullData = { _id: fullData._id diff --git a/deps/npm/node_modules/npm-registry-client/lib/unpublish.js b/deps/npm/node_modules/npm-registry-client/lib/unpublish.js index 9aaac1b70..4bbbb347e 100644 --- a/deps/npm/node_modules/npm-registry-client/lib/unpublish.js +++ b/deps/npm/node_modules/npm-registry-client/lib/unpublish.js @@ -14,7 +14,8 @@ var semver = require("semver") function unpublish (name, ver, cb) { if (typeof cb !== "function") cb = ver, ver = null - this.get(name, null, -1, true, function (er, data) { + var u = name + '?write=true' + this.get(u, null, -1, true, function (er, data) { if (er) { this.log.info("unpublish", name+" not published") return cb() |