Rename optparse to nopt

.gitmodules

@@ -4,6 +4,6 @@
 [submodule "node_modules/abbrev"]
 	path = node_modules/abbrev
 	url = git://github.com/isaacs/abbrev-js.git
-[submodule "node_modules/optparse"]
-	path = node_modules/optparse
-	url = git://github.com/isaacs/node-optparse.git
+[submodule "node_modules/nopt"]
+	path = node_modules/nopt
+	url = git://github.com/isaacs/nopt.git

bin/npm.js

@@ -15,11 +15,11 @@ var fs = require("../lib/utils/graceful-fs")
   , configDefs = require("../lib/utils/config-defs")
   , shorthands = configDefs.shorthands
   , types = configDefs.types
-  , optparse = require("optparse")
+  , nopt = require("nopt")
 
 log.verbose(process.argv, "cli")
 
-var conf = optparse(types, shorthands)
+var conf = nopt(types, shorthands)
 npm.argv = conf.argv.remain
 if (npm.deref(npm.argv[0])) npm.command = npm.argv.shift()
 else conf.usage = true

lib/completion.js

@@ -7,7 +7,7 @@ var output = require("./utils/output")
   , configDefs = require("./utils/config-defs")
   , configTypes = configDefs.types
   , shorthands = configDefs.shorthands
-  , optparse = require("optparse")
+  , nopt = require("nopt")
   , configNames = Object.keys(configTypes).filter(function (e) {
       return e.charAt(0) !== "_"
     })
@@ -116,7 +116,7 @@ function completion (args, cb) {
   // don't have to worry about the last arg being implicitly
   // boolean'ed, since the last block will catch that.
   var parsed = opts.conf =
-    optparse(configTypes, shorthands, partialWords.slice(0, -1), 0)
+    nopt(configTypes, shorthands, partialWords.slice(0, -1), 0)
   // check if there's a command already.
   console.error(parsed)
   var cmd = parsed.argv.remain[1]

package.json

@@ -49,8 +49,8 @@
                   }
 , "main" : "npm"
 , "bin" : "./bin/npm.js"
-, "dependencies" : { "semver" : "1", "abbrev" : "1", "optparse" : "1" }
-, "bundleDependencies" : [ "semver", "abbrev", "optparse" ]
+, "dependencies" : { "semver" : "1", "abbrev" : "1", "nopt" : "1" }
+, "bundleDependencies" : [ "semver", "abbrev", "nopt" ]
 , "devDependencies" : { "ronn" : "" }
 , "engines" : { "node" : "0.4 || 0.5", "npm" : "1" }
 , "scripts" : { "test" : "make test"