diff options
author | isaacs <i@izs.me> | 2011-04-27 23:31:22 +0400 |
---|---|---|
committer | isaacs <i@izs.me> | 2011-04-27 23:31:22 +0400 |
commit | 75b3264a4cc213f0961c0fcd9022ffd0da6f1684 (patch) | |
tree | 9d039e5a4cf6185bca023c3a2101db70e32bf0bc /lib/utils | |
parent | 4fc175e677ece0967e6cf58917ee8f07cfb79fe5 (diff) |
Just depend on node-uuid, don't include it.
Since this isn't required for the npm self-install process, don't bundle
it or load as a git submodule. It's only necessary for the adduser
command.
Diffstat (limited to 'lib/utils')
-rw-r--r-- | lib/utils/npm-registry-client/adduser.js | 2 | ||||
-rw-r--r-- | lib/utils/uuid.js | 84 |
2 files changed, 1 insertions, 85 deletions
diff --git a/lib/utils/npm-registry-client/adduser.js b/lib/utils/npm-registry-client/adduser.js index 0cda561bf..20d4d7cd9 100644 --- a/lib/utils/npm-registry-client/adduser.js +++ b/lib/utils/npm-registry-client/adduser.js @@ -1,7 +1,7 @@ module.exports = adduser -var uuid = require("../uuid") +var uuid = require("node-uuid") , request = require("./request") , log = require("../log") , base64 = require("../base64") diff --git a/lib/utils/uuid.js b/lib/utils/uuid.js deleted file mode 100644 index 54bfd5be0..000000000 --- a/lib/utils/uuid.js +++ /dev/null @@ -1,84 +0,0 @@ -(function() { - /* - * Generate a RFC4122(v4) UUID - * - * Documentation at https://github.com/broofa/node-uuid - * - * Copyright 2010 Robert Kieffer - * Dual licensed under the MIT and GPL licenses. - */ - - // Use node.js Buffer class if available, otherwise use the Array class - var BufferClass = typeof(Buffer) == 'function' ? Buffer : Array; - - // Buffer used for generating string uuids - var _buf = new BufferClass(16); - - // Cache number <-> hex string for octet values - var toString = []; - var toNumber = {}; - for (var i = 0; i < 256; i++) { - toString[i] = (i + 0x100).toString(16).substr(1).toUpperCase(); - toNumber[toString[i]] = i; - } - - function parse(s) { - var buf = new BufferClass(16); - var i = 0, ton = toNumber; - s.toUpperCase().replace(/[0-9A-F][0-9A-F]/g, function(octet) { - buf[i++] = toNumber[octet]; - }); - return buf; - } - - function unparse(buf) { - var tos = toString, b = buf; - return tos[b[0]] + tos[b[1]] + tos[b[2]] + tos[b[3]] + '-' + - tos[b[4]] + tos[b[5]] + '-' + - tos[b[6]] + tos[b[7]] + '-' + - tos[b[8]] + tos[b[9]] + '-' + - tos[b[10]] + tos[b[11]] + tos[b[12]] + - tos[b[13]] + tos[b[14]] + tos[b[15]]; - } - - function uuid(fmt, buf, offset) { - var b32 = 0x100000000, ff = 0xff; - - var b = fmt != 'binary' ? _buf : (buf ? buf : new BufferClass(16)); - var i = buf && offset || 0; - - r = Math.random()*b32; - b[i++] = r & ff; - b[i++] = (r=r>>>8) & ff; - b[i++] = (r=r>>>8) & ff; - b[i++] = (r=r>>>8) & ff; - r = Math.random()*b32; - b[i++] = r & ff; - b[i++] = (r=r>>>8) & ff; - b[i++] = (r=r>>>8) & 0x0f | 0x40; // See RFC4122 sect. 4.1.3 - b[i++] = (r=r>>>8) & ff; - r = Math.random()*b32; - b[i++] = r & 0x3f | 0x80; // See RFC4122 sect. 4.4 - b[i++] = (r=r>>>8) & ff; - b[i++] = (r=r>>>8) & ff; - b[i++] = (r=r>>>8) & ff; - r = Math.random()*b32; - b[i++] = r & ff; - b[i++] = (r=r>>>8) & ff; - b[i++] = (r=r>>>8) & ff; - b[i++] = (r=r>>>8) & ff; - - return fmt === undefined ? unparse(b) : b; - }; - - uuid.parse = parse; - uuid.unparse = unparse; - uuid.BufferClass = BufferClass; - - if (typeof(module) != 'undefined') { - module.exports = uuid; - } else { - // In browser? Set as top-level function - this.uuid = uuid; - } -})(); |