Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

npm: Upgrade to 1.1.49

- node-gyp@0.6.5
- abstracted-out configs
- publishing over proxies
- bugfixes to all the deps
  • Loading branch information...
commit 3ccee087597c6a14c1b171d43a618c10889d4169 1 parent 2c13cbb
@isaacs isaacs authored
Showing with 2,549 additions and 983 deletions.
  1. +13 −34 deps/npm/README.md
  2. +5 −6 deps/npm/bin/npm-cli.js
  3. +1 −1  deps/npm/html/api/bin.html
  4. +1 −1  deps/npm/html/api/bugs.html
  5. +1 −1  deps/npm/html/api/commands.html
  6. +1 −1  deps/npm/html/api/config.html
  7. +1 −1  deps/npm/html/api/deprecate.html
  8. +1 −1  deps/npm/html/api/docs.html
  9. +1 −1  deps/npm/html/api/edit.html
  10. +1 −1  deps/npm/html/api/explore.html
  11. +1 −1  deps/npm/html/api/help-search.html
  12. +1 −1  deps/npm/html/api/init.html
  13. +1 −1  deps/npm/html/api/install.html
  14. +1 −1  deps/npm/html/api/link.html
  15. +1 −1  deps/npm/html/api/load.html
  16. +1 −1  deps/npm/html/api/ls.html
  17. +2 −2 deps/npm/html/api/npm.html
  18. +1 −1  deps/npm/html/api/outdated.html
  19. +1 −1  deps/npm/html/api/owner.html
  20. +1 −1  deps/npm/html/api/pack.html
  21. +1 −1  deps/npm/html/api/prefix.html
  22. +1 −1  deps/npm/html/api/prune.html
  23. +1 −1  deps/npm/html/api/publish.html
  24. +1 −1  deps/npm/html/api/rebuild.html
  25. +1 −1  deps/npm/html/api/restart.html
  26. +1 −1  deps/npm/html/api/root.html
  27. +1 −1  deps/npm/html/api/run-script.html
  28. +1 −1  deps/npm/html/api/search.html
  29. +1 −1  deps/npm/html/api/shrinkwrap.html
  30. +1 −1  deps/npm/html/api/start.html
  31. +1 −1  deps/npm/html/api/stop.html
  32. +1 −1  deps/npm/html/api/submodule.html
  33. +1 −1  deps/npm/html/api/tag.html
  34. +1 −1  deps/npm/html/api/test.html
  35. +1 −1  deps/npm/html/api/uninstall.html
  36. +1 −1  deps/npm/html/api/unpublish.html
  37. +1 −1  deps/npm/html/api/update.html
  38. +1 −1  deps/npm/html/api/version.html
  39. +1 −1  deps/npm/html/api/view.html
  40. +1 −1  deps/npm/html/api/whoami.html
  41. +14 −35 deps/npm/html/doc/README.html
  42. +1 −1  deps/npm/html/doc/adduser.html
  43. +1 −1  deps/npm/html/doc/bin.html
  44. +1 −1  deps/npm/html/doc/bugs.html
  45. +1 −1  deps/npm/html/doc/build.html
  46. +1 −1  deps/npm/html/doc/bundle.html
  47. +1 −1  deps/npm/html/doc/cache.html
  48. +1 −1  deps/npm/html/doc/changelog.html
  49. +1 −1  deps/npm/html/doc/coding-style.html
  50. +1 −1  deps/npm/html/doc/completion.html
  51. +1 −1  deps/npm/html/doc/config.html
  52. +1 −1  deps/npm/html/doc/deprecate.html
  53. +1 −1  deps/npm/html/doc/developers.html
  54. +1 −1  deps/npm/html/doc/disputes.html
  55. +1 −1  deps/npm/html/doc/docs.html
  56. +1 −1  deps/npm/html/doc/edit.html
  57. +1 −1  deps/npm/html/doc/explore.html
  58. +1 −1  deps/npm/html/doc/faq.html
  59. +1 −1  deps/npm/html/doc/folders.html
  60. +1 −1  deps/npm/html/doc/help-search.html
  61. +1 −1  deps/npm/html/doc/help.html
  62. +1 −1  deps/npm/html/doc/index.html
  63. +1 −1  deps/npm/html/doc/init.html
  64. +1 −1  deps/npm/html/doc/install.html
  65. +1 −1  deps/npm/html/doc/json.html
  66. +1 −1  deps/npm/html/doc/link.html
  67. +2 −2 deps/npm/html/doc/list.html
  68. +2 −2 deps/npm/html/doc/npm.html
  69. +1 −1  deps/npm/html/doc/outdated.html
  70. +1 −1  deps/npm/html/doc/owner.html
  71. +1 −1  deps/npm/html/doc/pack.html
  72. +1 −1  deps/npm/html/doc/prefix.html
  73. +1 −1  deps/npm/html/doc/prune.html
  74. +1 −1  deps/npm/html/doc/publish.html
  75. +1 −1  deps/npm/html/doc/rebuild.html
  76. +1 −1  deps/npm/html/doc/registry.html
  77. +1 −1  deps/npm/html/doc/removing-npm.html
  78. +1 −1  deps/npm/html/doc/restart.html
  79. +1 −1  deps/npm/html/doc/root.html
  80. +1 −1  deps/npm/html/doc/run-script.html
  81. +1 −1  deps/npm/html/doc/scripts.html
  82. +1 −1  deps/npm/html/doc/search.html
  83. +1 −1  deps/npm/html/doc/semver.html
  84. +1 −1  deps/npm/html/doc/shrinkwrap.html
  85. +1 −1  deps/npm/html/doc/star.html
  86. +1 −1  deps/npm/html/doc/start.html
  87. +1 −1  deps/npm/html/doc/stop.html
  88. +1 −1  deps/npm/html/doc/submodule.html
  89. +1 −1  deps/npm/html/doc/tag.html
  90. +1 −1  deps/npm/html/doc/test.html
  91. +1 −1  deps/npm/html/doc/uninstall.html
  92. +1 −1  deps/npm/html/doc/unpublish.html
  93. +1 −1  deps/npm/html/doc/update.html
  94. +1 −1  deps/npm/html/doc/version.html
  95. +1 −1  deps/npm/html/doc/view.html
  96. +1 −1  deps/npm/html/doc/whoami.html
  97. +5 −6 deps/npm/lib/adduser.js
  98. +5 −3 deps/npm/lib/build.js
  99. +3 −1 deps/npm/lib/completion.js
  100. +82 −101 deps/npm/lib/config.js
  101. +29 −30 deps/npm/lib/npm.js
  102. +4 −3 deps/npm/lib/publish.js
  103. +2 −3 deps/npm/lib/utils/error-handler.js
  104. +0 −352 deps/npm/lib/utils/ini.js
  105. +6 −3 deps/npm/lib/utils/lifecycle.js
  106. +19 −1 deps/npm/lib/version.js
  107. +0 −1  deps/npm/lib/view.js
  108. +15 −85 deps/npm/man/man1/README.1
  109. +1 −1  deps/npm/man/man1/list.1
  110. +1 −1  deps/npm/man/man1/npm.1
  111. +1 −1  deps/npm/man/man3/npm.3
  112. +4 −0 deps/npm/node_modules/couch-login/couch-login.js
  113. +3 −3 deps/npm/node_modules/couch-login/package.json
  114. +1 −1  deps/npm/node_modules/glob/glob.js
  115. +2 −2 deps/npm/node_modules/glob/package.json
  116. +25 −7 deps/npm/node_modules/ini/ini.js
  117. +10 −6 deps/npm/node_modules/ini/package.json
  118. +23 −0 deps/npm/node_modules/ini/test/bar.js
  119. +29 −0 deps/npm/node_modules/ini/test/fixtures/foo.ini
  120. +59 −0 deps/npm/node_modules/ini/test/foo.js
  121. +33 −20 deps/npm/node_modules/lru-cache/README.md
  122. +51 −21 deps/npm/node_modules/lru-cache/lib/lru-cache.js
  123. +7 −4 deps/npm/node_modules/lru-cache/package.json
  124. +58 −20 deps/npm/node_modules/lru-cache/test/basic.js
  125. +1 −1  deps/npm/node_modules/minimatch/minimatch.js
  126. +7 −17 deps/npm/node_modules/minimatch/package.json
  127. +24 −0 deps/npm/node_modules/node-gyp/addon.gypi
  128. +46 −22 deps/npm/node_modules/node-gyp/lib/configure.js
  129. +22 −6 deps/npm/node_modules/node-gyp/lib/install.js
  130. +3 −3 deps/npm/node_modules/node-gyp/package.json
  131. +0 −9 deps/npm/node_modules/node-gyp/updateLegacy.sh
  132. +1 −0  deps/npm/node_modules/npm-registry-client/index.js
  133. +3 −3 deps/npm/node_modules/npm-registry-client/package.json
  134. +1 −0  deps/npm/node_modules/npmconf/.npmignore
  135. +33 −0 deps/npm/node_modules/npmconf/README.md
  136. +11 −3 deps/npm/{lib/utils → node_modules/npmconf}/config-defs.js
  137. +3 −0  deps/npm/node_modules/npmconf/node_modules/config-chain/.npmignore
  138. +22 −0 deps/npm/node_modules/npmconf/node_modules/config-chain/LICENCE
  139. +282 −0 deps/npm/node_modules/npmconf/node_modules/config-chain/index.js
  140. 0  deps/npm/node_modules/{ → npmconf/node_modules/config-chain/node_modules}/proto-list/LICENSE
  141. 0  deps/npm/node_modules/{ → npmconf/node_modules/config-chain/node_modules}/proto-list/README.md
  142. +28 −0 deps/npm/node_modules/npmconf/node_modules/config-chain/node_modules/proto-list/package.json
  143. +30 −43 deps/npm/node_modules/{ → npmconf/node_modules/config-chain/node_modules}/proto-list/proto-list.js
  144. +61 −0 deps/npm/node_modules/npmconf/node_modules/config-chain/node_modules/proto-list/test/basic.js
  145. +28 −0 deps/npm/node_modules/npmconf/node_modules/config-chain/package.json
  146. +228 −0 deps/npm/node_modules/npmconf/node_modules/config-chain/readme.markdown
  147. +10 −0 deps/npm/node_modules/npmconf/node_modules/config-chain/test/broken.js
  148. +21 −0 deps/npm/node_modules/npmconf/node_modules/config-chain/test/broken.json
  149. +100 −0 deps/npm/node_modules/npmconf/node_modules/config-chain/test/chain-class.js
  150. +10 −0 deps/npm/node_modules/npmconf/node_modules/config-chain/test/env.js
  151. +13 −0 deps/npm/node_modules/npmconf/node_modules/config-chain/test/find-file.js
  152. +5 −0 deps/npm/node_modules/npmconf/node_modules/config-chain/test/ignore-unfound-file.js
  153. +18 −0 deps/npm/node_modules/npmconf/node_modules/config-chain/test/ini.js
  154. +59 −0 deps/npm/node_modules/npmconf/node_modules/config-chain/test/save.js
  155. +324 −0 deps/npm/node_modules/npmconf/npmconf.js
  156. +42 −0 deps/npm/node_modules/npmconf/package.json
  157. +27 −0 deps/npm/node_modules/npmconf/test/00-setup.js
  158. +72 −0 deps/npm/node_modules/npmconf/test/basic.js
  159. +72 −0 deps/npm/node_modules/npmconf/test/builtin.js
  160. +1 −0  deps/npm/node_modules/npmconf/test/fixtures/builtin
  161. +1 −0  deps/npm/node_modules/npmconf/test/fixtures/globalconfig
  162. +22 −0 deps/npm/node_modules/npmconf/test/fixtures/userconfig
  163. +74 −0 deps/npm/node_modules/npmconf/test/save.js
  164. +27 −0 deps/npm/node_modules/once/LICENSE
  165. +33 −0 deps/npm/node_modules/once/README.md
  166. +19 −0 deps/npm/node_modules/once/once.js
  167. +35 −0 deps/npm/node_modules/once/package.json
  168. +18 −0 deps/npm/node_modules/once/test/once.js
  169. +0 −9 deps/npm/node_modules/proto-list/package.json
  170. +3 −3 deps/npm/node_modules/read-package-json/package.json
  171. +1 −1  deps/npm/node_modules/read-package-json/read-json.js
  172. +8 −1 deps/npm/node_modules/read/lib/read.js
  173. +2 −2 deps/npm/node_modules/read/package.json
  174. +76 −0 deps/npm/node_modules/read/test/many.js
  175. +16 −13 deps/npm/package.json
View
47 deps/npm/README.md
@@ -35,31 +35,18 @@ paths, etc.) then read on.
## Fancy Install (Unix)
-To install npm with one command, do this:
-
- curl http://npmjs.org/install.sh | sh
-
-To skip the npm 0.x cleanup, do this:
-
- curl http://npmjs.org/install.sh | clean=no sh
-
-To say "yes" to the 0.x cleanup, but skip the prompt:
-
- curl http://npmjs.org/install.sh | clean=yes sh
-
-If you get permission errors, you'll need to **run** the script as root.
-(Note, just putting `sudo` in front of the `curl` will **fetch** the script
-as root.)
+There's a pretty robust install script at
+<https://npmjs.org/install.sh>. You can download that and run it.
### Slightly Fancier
You can set any npm configuration params with that script:
- curl http://npmjs.org/install.sh | npm_config_prefix=/some/path sh
+npm_config_prefix=/some/path sh install.sh
Or, you can run it in uber-debuggery mode:
- curl http://npmjs.org/install.sh | npm_debug=1 sh
+npm_debug=1 sh install.sh
### Even Fancier
@@ -83,21 +70,6 @@ git, and mess with it directly.
No.
-## Dev Install
-
-To install the latest **unstable** development version from git:
-
- git clone https://github.com/isaacs/npm.git
- cd npm
- sudo make install # (or: `node cli.js install -gf`)
-
-If you're sitting in the code folder reading this document in your
-terminal, then you've already got the code. Just do:
-
- sudo make install
-
-and npm will install itself.
-
## Permissions when Using npm to Install Other Stuff
**tl;dr**
@@ -163,6 +135,14 @@ you have chosen.
If you would like to use npm programmatically, you can do that.
It's not very well documented, but it *is* rather simple.
+Most of the time, unless you actually want to do all the things that
+npm does, you should try using one of npm's dependencies rather than
+using npm itself, if possible.
+
+Eventually, npm will be just a thin cli wrapper around the modules
+that it depends on, but for now, there are some things that you must
+use npm itself to do.
+
var npm = require("npm")
npm.load(myConfigObject, function (er) {
if (er) return handlError(er)
@@ -195,8 +175,7 @@ especially the [faq](http://npmjs.org/doc/faq.html).
You can use the `npm help` command to read any of them.
If you're a developer, and you want to use npm to publish your program,
-you should
-[read this](http://npmjs.org/doc/developers.html)
+you should [read this](http://npmjs.org/doc/developers.html)
## Legal Stuff
View
11 deps/npm/bin/npm-cli.js
@@ -22,10 +22,10 @@ log.info("it worked if it ends with", "ok")
var fs = require("graceful-fs")
, path = require("path")
, npm = require("../lib/npm.js")
- , ini = require("../lib/utils/ini.js")
+ , npmconf = require("npmconf")
, errorHandler = require("../lib/utils/error-handler.js")
- , configDefs = require("../lib/utils/config-defs.js")
+ , configDefs = npmconf.defs
, shorthands = configDefs.shorthands
, types = configDefs.types
, nopt = require("nopt")
@@ -50,10 +50,9 @@ if (conf.version) {
}
if (conf.versions) {
- var v = process.versions
- v.npm = npm.version
- console.log(v)
- return
+ npm.command = "version"
+ conf.usage = false
+ npm.argv = []
}
log.info("using", "npm@%s", npm.version)
View
2  deps/npm/html/api/bin.html
@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>This function should not be used programmatically. Instead, just refer
to the <code>npm.bin</code> member.</p>
</div>
-<p id="footer">bin &mdash; npm@1.1.48</p>
+<p id="footer">bin &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/bugs.html
@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>This command will launch a browser, so this command may not be the most
friendly for programmatic use.</p>
</div>
-<p id="footer">bugs &mdash; npm@1.1.48</p>
+<p id="footer">bugs &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/commands.html
@@ -28,7 +28,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/index.html">index(1)</a></li></ul>
</div>
-<p id="footer">commands &mdash; npm@1.1.48</p>
+<p id="footer">commands &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/config.html
@@ -33,7 +33,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../api/npm.html">npm(3)</a></li></ul>
</div>
-<p id="footer">config &mdash; npm@1.1.48</p>
+<p id="footer">config &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/deprecate.html
@@ -30,7 +30,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../api/publish.html">publish(3)</a></li><li><a href="../api/unpublish.html">unpublish(3)</a></li><li><a href="../doc/registry.html">registry(1)</a></li></ul>
</div>
-<p id="footer">deprecate &mdash; npm@1.1.48</p>
+<p id="footer">deprecate &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/docs.html
@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>This command will launch a browser, so this command may not be the most
friendly for programmatic use.</p>
</div>
-<p id="footer">docs &mdash; npm@1.1.48</p>
+<p id="footer">docs &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/edit.html
@@ -30,7 +30,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>Since this command opens an editor in a new process, be careful about where
and how this is used.</p>
</div>
-<p id="footer">edit &mdash; npm@1.1.48</p>
+<p id="footer">edit &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/explore.html
@@ -24,7 +24,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>The first element in the &#39;args&#39; parameter must be a package name. After that is the optional command, which can be any number of strings. All of the strings will be combined into one, space-delimited command.</p>
</div>
-<p id="footer">explore &mdash; npm@1.1.48</p>
+<p id="footer">explore &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/help-search.html
@@ -32,7 +32,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>The silent parameter is not neccessary not used, but it may in the future.</p>
</div>
-<p id="footer">help-search &mdash; npm@1.1.48</p>
+<p id="footer">help-search &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/init.html
@@ -35,7 +35,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<p><a href="../doc/json.html">json(1)</a></p>
</div>
-<p id="footer">init &mdash; npm@1.1.48</p>
+<p id="footer">init &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/install.html
@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>Finally, &#39;callback&#39; is a function that will be called when all packages have been
installed or when an error has been encountered.</p>
</div>
-<p id="footer">install &mdash; npm@1.1.48</p>
+<p id="footer">install &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/link.html
@@ -39,7 +39,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>Now, any changes to the redis package will be reflected in
the package in the current working directory</p>
</div>
-<p id="footer">link &mdash; npm@1.1.48</p>
+<p id="footer">link &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/load.html
@@ -32,7 +32,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>For a list of all the available command-line configs, see <code>npm help config</code></p>
</div>
-<p id="footer">load &mdash; npm@1.1.48</p>
+<p id="footer">load &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/ls.html
@@ -59,7 +59,7 @@ <h3 id="global">global</h3>
This means that if a submodule a same dependency as a parent module, then the
dependency will only be output once.</p>
</div>
-<p id="footer">ls &mdash; npm@1.1.48</p>
+<p id="footer">ls &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
4 deps/npm/html/api/npm.html
@@ -24,7 +24,7 @@ <h2 id="SYNOPSIS">SYNOPSIS</h2>
<h2 id="VERSION">VERSION</h2>
-<p>1.1.48</p>
+<p>1.1.49</p>
<h2 id="DESCRIPTION">DESCRIPTION</h2>
@@ -91,7 +91,7 @@ <h2 id="ABBREVS">ABBREVS</h2>
<pre><code>var cmd = npm.deref(&quot;unp&quot;) // cmd === &quot;unpublish&quot;</code></pre>
</div>
-<p id="footer">npm &mdash; npm@1.1.48</p>
+<p id="footer">npm &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/outdated.html
@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>If the &#39;packages&#39; parameter is left out, npm will check all packages.</p>
</div>
-<p id="footer">outdated &mdash; npm@1.1.48</p>
+<p id="footer">outdated &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/owner.html
@@ -34,7 +34,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../api/publish.html">publish(3)</a></li><li><a href="../doc/registry.html">registry(1)</a></li></ul>
</div>
-<p id="footer">owner &mdash; npm@1.1.48</p>
+<p id="footer">owner &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/pack.html
@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>If no arguments are supplied, then npm packs the current package folder.</p>
</div>
-<p id="footer">pack &mdash; npm@1.1.48</p>
+<p id="footer">pack &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/prefix.html
@@ -21,7 +21,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>This function is not useful programmatically</p>
</div>
-<p id="footer">prefix &mdash; npm@1.1.48</p>
+<p id="footer">prefix &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/prune.html
@@ -23,7 +23,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>Extraneous packages are packages that are not listed on the parent
package&#39;s dependencies list.</p>
</div>
-<p id="footer">prune &mdash; npm@1.1.48</p>
+<p id="footer">prune &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/publish.html
@@ -32,7 +32,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/adduser.html">adduser(1)</a></li><li><a href="../api/owner.html">owner(3)</a></li></ul>
</div>
-<p id="footer">publish &mdash; npm@1.1.48</p>
+<p id="footer">publish &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/rebuild.html
@@ -22,7 +22,7 @@ <h2 id="CONFIGURATION">CONFIGURATION</h2>
<p>See <code>npm help build</code></p>
</div>
-<p id="footer">rebuild &mdash; npm@1.1.48</p>
+<p id="footer">rebuild &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/restart.html
@@ -27,7 +27,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../api/start.html">start(3)</a></li><li><a href="../api/stop.html">stop(3)</a></li></ul>
</div>
-<p id="footer">restart &mdash; npm@1.1.48</p>
+<p id="footer">restart &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/root.html
@@ -21,7 +21,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>This function is not useful programmatically.</p>
</div>
-<p id="footer">root &mdash; npm@1.1.48</p>
+<p id="footer">root &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/run-script.html
@@ -29,7 +29,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/scripts.html">scripts(1)</a></li><li><a href="../api/test.html">test(3)</a></li><li><a href="../api/start.html">start(3)</a></li><li><a href="../api/restart.html">restart(3)</a></li><li><a href="../api/stop.html">stop(3)</a></li></ul>
</div>
-<p id="footer">run-script &mdash; npm@1.1.48</p>
+<p id="footer">run-script &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/search.html
@@ -32,7 +32,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
and doesn&#39;t try to read your mind (it doesn&#39;t do any verb tense matching or the
like).</p>
</div>
-<p id="footer">search &mdash; npm@1.1.48</p>
+<p id="footer">search &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/shrinkwrap.html
@@ -26,7 +26,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>Finally, &#39;callback&#39; is a function that will be called when the shrinkwrap has
been saved.</p>
</div>
-<p id="footer">shrinkwrap &mdash; npm@1.1.48</p>
+<p id="footer">shrinkwrap &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/start.html
@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>npm can run tests on multiple packages. Just specify multiple packages
in the <code>packages</code> parameter.</p>
</div>
-<p id="footer">start &mdash; npm@1.1.48</p>
+<p id="footer">start &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/stop.html
@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>npm can run stop on multiple packages. Just specify multiple packages
in the <code>packages</code> parameter.</p>
</div>
-<p id="footer">stop &mdash; npm@1.1.48</p>
+<p id="footer">stop &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/submodule.html
@@ -33,7 +33,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li>npm help json</li><li>git help submodule</li></ul>
</div>
-<p id="footer">submodule &mdash; npm@1.1.48</p>
+<p id="footer">submodule &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/tag.html
@@ -29,7 +29,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
used. For more information about how to set this config, check
<code>man 3 npm-config</code> for programmatic usage or <code>man npm-config</code> for cli usage.</p>
</div>
-<p id="footer">tag &mdash; npm@1.1.48</p>
+<p id="footer">tag &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/test.html
@@ -22,7 +22,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>npm can run tests on multiple packages. Just specify multiple packages
in the <code>packages</code> parameter.</p>
</div>
-<p id="footer">test &mdash; npm@1.1.48</p>
+<p id="footer">test &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/uninstall.html
@@ -22,7 +22,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>Finally, &#39;callback&#39; is a function that will be called when all packages have been
uninstalled or when an error has been encountered.</p>
</div>
-<p id="footer">uninstall &mdash; npm@1.1.48</p>
+<p id="footer">uninstall &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/unpublish.html
@@ -26,7 +26,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>If no version is specified, or if all versions are removed then
the root package entry is removed from the registry entirely.</p>
</div>
-<p id="footer">unpublish &mdash; npm@1.1.48</p>
+<p id="footer">unpublish &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/update.html
@@ -18,7 +18,7 @@ <h2 id="SYNOPSIS">SYNOPSIS</h2>
<p>The &#39;packages&#39; argument is an array of packages to update. The &#39;callback&#39; parameter will be called when done or when an error occurs.</p>
</div>
-<p id="footer">update &mdash; npm@1.1.48</p>
+<p id="footer">update &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/version.html
@@ -24,7 +24,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
parameter. The difference, however, is this function will fail if it does
not have exactly one element. The only element should be a version number.</p>
</div>
-<p id="footer">version &mdash; npm@1.1.48</p>
+<p id="footer">version &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/view.html
@@ -99,7 +99,7 @@ <h2 id="RETURN-VALUE">RETURN VALUE</h2>
<p>corresponding to the list of fields selected.</p>
</div>
-<p id="footer">view &mdash; npm@1.1.48</p>
+<p id="footer">view &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/api/whoami.html
@@ -21,7 +21,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>This function is not useful programmatically</p>
</div>
-<p id="footer">whoami &mdash; npm@1.1.48</p>
+<p id="footer">whoami &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
49 deps/npm/html/doc/README.html
@@ -42,31 +42,18 @@ <h3 id="Other-Sorts-of-Unices">Other Sorts of Unices</h3>
<h2 id="Fancy-Install-Unix">Fancy Install (Unix)</h2>
-<p>To install npm with one command, do this:</p>
-
-<pre><code>curl http://npmjs.org/install.sh | sh</code></pre>
-
-<p>To skip the npm 0.x cleanup, do this:</p>
-
-<pre><code>curl http://npmjs.org/install.sh | clean=no sh</code></pre>
-
-<p>To say &quot;yes&quot; to the 0.x cleanup, but skip the prompt:</p>
-
-<pre><code>curl http://npmjs.org/install.sh | clean=yes sh</code></pre>
-
-<p>If you get permission errors, you&#39;ll need to <strong>run</strong> the script as root.
-(Note, just putting <code>sudo</code> in front of the <code>curl</code> will <strong>fetch</strong> the script
-as root.)</p>
+<p>There&#39;s a pretty robust install script at
+<a href="https://npmjs.org/install.sh">https://npmjs.org/install.sh</a>. You can download that and run it.</p>
<h3 id="Slightly-Fancier">Slightly Fancier</h3>
<p>You can set any npm configuration params with that script:</p>
-<pre><code>curl http://npmjs.org/install.sh | npm_config_prefix=/some/path sh</code></pre>
+<p>npm<em>config</em>prefix=/some/path sh install.sh</p>
<p>Or, you can run it in uber-debuggery mode:</p>
-<pre><code>curl http://npmjs.org/install.sh | npm_debug=1 sh</code></pre>
+<p>npm_debug=1 sh install.sh</p>
<h3 id="Even-Fancier">Even Fancier</h3>
@@ -90,21 +77,6 @@ <h2 id="Installing-on-Cygwin">Installing on Cygwin</h2>
<p>No.</p>
-<h2 id="Dev-Install">Dev Install</h2>
-
-<p>To install the latest <strong>unstable</strong> development version from git:</p>
-
-<pre><code>git clone https://github.com/isaacs/npm.git
-cd npm
-sudo make install # (or: `node cli.js install -gf`)</code></pre>
-
-<p>If you&#39;re sitting in the code folder reading this document in your
-terminal, then you&#39;ve already got the code. Just do:</p>
-
-<pre><code>sudo make install</code></pre>
-
-<p>and npm will install itself.</p>
-
<h2 id="Permissions-when-Using-npm-to-Install-Other-Stuff">Permissions when Using npm to Install Other Stuff</h2>
<p><strong>tl;dr</strong></p>
@@ -169,6 +141,14 @@ <h2 id="Using-npm-Programmatically">Using npm Programmatically</h2>
<p>If you would like to use npm programmatically, you can do that.
It&#39;s not very well documented, but it <em>is</em> rather simple.</p>
+<p>Most of the time, unless you actually want to do all the things that
+npm does, you should try using one of npm&#39;s dependencies rather than
+using npm itself, if possible.</p>
+
+<p>Eventually, npm will be just a thin cli wrapper around the modules
+that it depends on, but for now, there are some things that you must
+use npm itself to do.</p>
+
<pre><code>var npm = require(&quot;npm&quot;)
npm.load(myConfigObject, function (er) {
if (er) return handlError(er)
@@ -201,8 +181,7 @@ <h2 id="More-Docs">More Docs</h2>
<p>You can use the <code>npm help</code> command to read any of them.</p>
<p>If you&#39;re a developer, and you want to use npm to publish your program,
-you should
-<a href="http://npmjs.org/doc/developers.html">read this</a></p>
+you should <a href="http://npmjs.org/doc/developers.html">read this</a></p>
<h2 id="Legal-Stuff">Legal Stuff</h2>
@@ -261,7 +240,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/npm.html">npm(1)</a></li><li><a href="../doc/faq.html">faq(1)</a></li><li><a href="../doc/help.html">help(1)</a></li><li><a href="../doc/index.html">index(1)</a></li></ul>
</div>
-<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@1.1.48</p>
+<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/adduser.html
@@ -39,7 +39,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/owner.html">owner(1)</a></li><li><a href="../doc/whoami.html">whoami(1)</a></li></ul>
</div>
-<p id="footer">adduser &mdash; npm@1.1.48</p>
+<p id="footer">adduser &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/bin.html
@@ -20,7 +20,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/prefix.html">prefix(1)</a></li><li><a href="../doc/root.html">root(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/config.html">config(1)</a></li></ul>
</div>
-<p id="footer">bin &mdash; npm@1.1.48</p>
+<p id="footer">bin &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/bugs.html
@@ -36,7 +36,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/docs.html">docs(1)</a></li><li><a href="../doc/view.html">view(1)</a></li><li><a href="../doc/publish.html">publish(1)</a></li><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/json.html">json(1)</a></li></ul>
</div>
-<p id="footer">bugs &mdash; npm@1.1.48</p>
+<p id="footer">bugs &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/build.html
@@ -25,7 +25,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/install.html">install(1)</a></li><li><a href="../doc/link.html">link(1)</a></li><li><a href="../doc/scripts.html">scripts(1)</a></li><li><a href="../doc/json.html">json(1)</a></li></ul>
</div>
-<p id="footer">build &mdash; npm@1.1.48</p>
+<p id="footer">build &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/bundle.html
@@ -20,7 +20,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/install.html">install(1)</a></li></ul>
</div>
-<p id="footer">bundle &mdash; npm@1.1.48</p>
+<p id="footer">bundle &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/cache.html
@@ -66,7 +66,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/install.html">install(1)</a></li><li><a href="../doc/publish.html">publish(1)</a></li><li><a href="../doc/pack.html">pack(1)</a></li></ul>
</div>
-<p id="footer">cache &mdash; npm@1.1.48</p>
+<p id="footer">cache &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/changelog.html
@@ -65,7 +65,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/npm.html">npm(1)</a></li><li><a href="../doc/faq.html">faq(1)</a></li></ul>
</div>
-<p id="footer">changelog &mdash; npm@1.1.48</p>
+<p id="footer">changelog &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/coding-style.html
@@ -180,7 +180,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/developers.html">developers(1)</a></li><li><a href="../doc/faq.html">faq(1)</a></li><li><a href="../doc/npm.html">npm(1)</a></li></ul>
</div>
-<p id="footer">coding-style &mdash; npm@1.1.48</p>
+<p id="footer">coding-style &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/completion.html
@@ -33,7 +33,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/developers.html">developers(1)</a></li><li><a href="../doc/faq.html">faq(1)</a></li><li><a href="../doc/npm.html">npm(1)</a></li></ul>
</div>
-<p id="footer">completion &mdash; npm@1.1.48</p>
+<p id="footer">completion &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/config.html
@@ -748,7 +748,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/npm.html">npm(1)</a></li></ul>
</div>
-<p id="footer">config &mdash; npm@1.1.48</p>
+<p id="footer">config &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/deprecate.html
@@ -29,7 +29,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/publish.html">publish(1)</a></li><li><a href="../doc/registry.html">registry(1)</a></li></ul>
</div>
-<p id="footer">deprecate &mdash; npm@1.1.48</p>
+<p id="footer">deprecate &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/developers.html
@@ -160,7 +160,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/faq.html">faq(1)</a></li><li><a href="../doc/npm.html">npm(1)</a></li><li><a href="../doc/init.html">init(1)</a></li><li><a href="../doc/json.html">json(1)</a></li><li><a href="../doc/scripts.html">scripts(1)</a></li><li><a href="../doc/publish.html">publish(1)</a></li><li><a href="../doc/adduser.html">adduser(1)</a></li><li><a href="../doc/registry.html">registry(1)</a></li></ul>
</div>
-<p id="footer">developers &mdash; npm@1.1.48</p>
+<p id="footer">developers &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/disputes.html
@@ -80,7 +80,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/owner.html">owner(1)</a></li></ul>
</div>
-<p id="footer">disputes &mdash; npm@1.1.48</p>
+<p id="footer">disputes &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/docs.html
@@ -37,7 +37,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/view.html">view(1)</a></li><li><a href="../doc/publish.html">publish(1)</a></li><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/json.html">json(1)</a></li></ul>
</div>
-<p id="footer">docs &mdash; npm@1.1.48</p>
+<p id="footer">docs &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/edit.html
@@ -37,7 +37,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/explore.html">explore(1)</a></li><li><a href="../doc/install.html">install(1)</a></li><li><a href="../doc/config.html">config(1)</a></li></ul>
</div>
-<p id="footer">edit &mdash; npm@1.1.48</p>
+<p id="footer">edit &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/explore.html
@@ -40,7 +40,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/submodule.html">submodule(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/edit.html">edit(1)</a></li><li><a href="../doc/rebuild.html">rebuild(1)</a></li><li><a href="../doc/build.html">build(1)</a></li><li><a href="../doc/install.html">install(1)</a></li></ul>
</div>
-<p id="footer">explore &mdash; npm@1.1.48</p>
+<p id="footer">explore &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/faq.html
@@ -241,7 +241,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/npm.html">npm(1)</a></li><li><a href="../doc/developers.html">developers(1)</a></li><li><a href="../doc/json.html">json(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li></ul>
</div>
-<p id="footer">faq &mdash; npm@1.1.48</p>
+<p id="footer">faq &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/folders.html
@@ -205,7 +205,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/faq.html">faq(1)</a></li><li><a href="../doc/json.html">json(1)</a></li><li><a href="../doc/install.html">install(1)</a></li><li><a href="../doc/pack.html">pack(1)</a></li><li><a href="../doc/cache.html">cache(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/publish.html">publish(1)</a></li></ul>
</div>
-<p id="footer">folders &mdash; npm@1.1.48</p>
+<p id="footer">folders &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/help-search.html
@@ -38,7 +38,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/npm.html">npm(1)</a></li><li><a href="../doc/faq.html">faq(1)</a></li><li><a href="../doc/help.html">help(1)</a></li></ul>
</div>
-<p id="footer">help-search &mdash; npm@1.1.48</p>
+<p id="footer">help-search &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/help.html
@@ -36,7 +36,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/npm.html">npm(1)</a></li><li><a href="../doc/README.html">README</a></li><li><a href="../doc/faq.html">faq(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/json.html">json(1)</a></li><li><a href="../doc/help-search.html">help-search(1)</a></li><li><a href="../doc/index.html">index(1)</a></li></ul>
</div>
-<p id="footer">help &mdash; npm@1.1.48</p>
+<p id="footer">help &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/index.html
@@ -384,7 +384,7 @@ <h2 id="npm-whoami-3"><a href="../api/whoami.html">whoami(3)</a></h2>
<p> Display npm username</p>
</div>
-<p id="footer">index &mdash; npm@1.1.48</p>
+<p id="footer">index &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/init.html
@@ -29,7 +29,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="https://github.com/isaacs/init-package-json">https://github.com/isaacs/init-package-json</a></li><li><a href="../doc/json.html">json(1)</a></li><li><a href="../doc/version.html">version(1)</a></li></ul>
</div>
-<p id="footer">init &mdash; npm@1.1.48</p>
+<p id="footer">init &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/install.html
@@ -133,7 +133,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/update.html">update(1)</a></li><li><a href="../doc/link.html">link(1)</a></li><li><a href="../doc/rebuild.html">rebuild(1)</a></li><li><a href="../doc/scripts.html">scripts(1)</a></li><li><a href="../doc/build.html">build(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/tag.html">tag(1)</a></li><li><a href="../doc/rm.html">rm(1)</a></li><li><a href="../doc/shrinkwrap.html">shrinkwrap(1)</a></li></ul>
</div>
-<p id="footer">install &mdash; npm@1.1.48</p>
+<p id="footer">install &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/json.html
@@ -525,7 +525,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/semver.html">semver(1)</a></li><li><a href="../doc/init.html">init(1)</a></li><li><a href="../doc/version.html">version(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/help.html">help(1)</a></li><li><a href="../doc/faq.html">faq(1)</a></li><li><a href="../doc/install.html">install(1)</a></li><li><a href="../doc/publish.html">publish(1)</a></li><li><a href="../doc/rm.html">rm(1)</a></li></ul>
</div>
-<p id="footer">json &mdash; npm@1.1.48</p>
+<p id="footer">json &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/link.html
@@ -58,7 +58,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/developers.html">developers(1)</a></li><li><a href="../doc/faq.html">faq(1)</a></li><li><a href="../doc/json.html">json(1)</a></li><li><a href="../doc/install.html">install(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/config.html">config(1)</a></li></ul>
</div>
-<p id="footer">link &mdash; npm@1.1.48</p>
+<p id="footer">link &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
4 deps/npm/html/doc/list.html
@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
nested packages will <em>also</em> show the paths to the specified packages.
For example, running <code>npm ls promzard</code> in npm&#39;s source tree will show:</p>
-<pre><code>npm@1.1.48 /path/to/npm
+<pre><code>npm@1.1.49 /path/to/npm
└─┬ init-package-json@0.0.4
└── promzard@0.1.5</code></pre>
@@ -64,7 +64,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/install.html">install(1)</a></li><li><a href="../doc/link.html">link(1)</a></li><li><a href="../doc/prune.html">prune(1)</a></li><li><a href="../doc/outdated.html">outdated(1)</a></li><li><a href="../doc/update.html">update(1)</a></li></ul>
</div>
-<p id="footer">list &mdash; npm@1.1.48</p>
+<p id="footer">list &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
4 deps/npm/html/doc/npm.html
@@ -14,7 +14,7 @@ <h2 id="SYNOPSIS">SYNOPSIS</h2>
<h2 id="VERSION">VERSION</h2>
-<p>1.1.48</p>
+<p>1.1.49</p>
<h2 id="DESCRIPTION">DESCRIPTION</h2>
@@ -135,7 +135,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/help.html">help(1)</a></li><li><a href="../doc/faq.html">faq(1)</a></li><li><a href="../doc/README.html">README</a></li><li><a href="../doc/json.html">json(1)</a></li><li><a href="../doc/install.html">install(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/index.html">index(1)</a></li><li><a href="../api/npm.html">npm(3)</a></li></ul>
</div>
-<p id="footer">npm &mdash; npm@1.1.48</p>
+<p id="footer">npm &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/outdated.html
@@ -21,7 +21,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/update.html">update(1)</a></li><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li></ul>
</div>
-<p id="footer">outdated &mdash; npm@1.1.48</p>
+<p id="footer">outdated &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/owner.html
@@ -34,7 +34,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/publish.html">publish(1)</a></li><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/adduser.html">adduser(1)</a></li><li><a href="../doc/disputes.html">disputes(1)</a></li></ul>
</div>
-<p id="footer">owner &mdash; npm@1.1.48</p>
+<p id="footer">owner &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/pack.html
@@ -29,7 +29,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/cache.html">cache(1)</a></li><li><a href="../doc/publish.html">publish(1)</a></li><li><a href="../doc/config.html">config(1)</a></li></ul>
</div>
-<p id="footer">pack &mdash; npm@1.1.48</p>
+<p id="footer">pack &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/prefix.html
@@ -20,7 +20,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/root.html">root(1)</a></li><li><a href="../doc/bin.html">bin(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/config.html">config(1)</a></li></ul>
</div>
-<p id="footer">prefix &mdash; npm@1.1.48</p>
+<p id="footer">prefix &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/prune.html
@@ -25,7 +25,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/rm.html">rm(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/list.html">list(1)</a></li></ul>
</div>
-<p id="footer">prune &mdash; npm@1.1.48</p>
+<p id="footer">prune &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/publish.html
@@ -29,7 +29,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/adduser.html">adduser(1)</a></li><li><a href="../doc/owner.html">owner(1)</a></li><li><a href="../doc/deprecate.html">deprecate(1)</a></li><li><a href="../doc/tag.html">tag(1)</a></li></ul>
</div>
-<p id="footer">publish &mdash; npm@1.1.48</p>
+<p id="footer">publish &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/rebuild.html
@@ -25,7 +25,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/build.html">build(1)</a></li><li><a href="../doc/install.html">install(1)</a></li></ul>
</div>
-<p id="footer">rebuild &mdash; npm@1.1.48</p>
+<p id="footer">rebuild &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/registry.html
@@ -97,7 +97,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/developers.html">developers(1)</a></li><li><a href="../doc/disputes.html">disputes(1)</a></li></ul>
</div>
-<p id="footer">registry &mdash; npm@1.1.48</p>
+<p id="footer">registry &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/removing-npm.html
@@ -58,7 +58,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/README.html">README</a></li><li><a href="../doc/rm.html">rm(1)</a></li><li><a href="../doc/prune.html">prune(1)</a></li></ul>
</div>
-<p id="footer">removing-npm &mdash; npm@1.1.48</p>
+<p id="footer">removing-npm &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/restart.html
@@ -24,7 +24,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/run-script.html">run-script(1)</a></li><li><a href="../doc/scripts.html">scripts(1)</a></li><li><a href="../doc/test.html">test(1)</a></li><li><a href="../doc/start.html">start(1)</a></li><li><a href="../doc/stop.html">stop(1)</a></li></ul>
</div>
-<p id="footer">restart &mdash; npm@1.1.48</p>
+<p id="footer">restart &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/root.html
@@ -20,7 +20,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/prefix.html">prefix(1)</a></li><li><a href="../doc/bin.html">bin(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/config.html">config(1)</a></li></ul>
</div>
-<p id="footer">root &mdash; npm@1.1.48</p>
+<p id="footer">root &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/run-script.html
@@ -23,7 +23,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/scripts.html">scripts(1)</a></li><li><a href="../doc/test.html">test(1)</a></li><li><a href="../doc/start.html">start(1)</a></li><li><a href="../doc/restart.html">restart(1)</a></li><li><a href="../doc/stop.html">stop(1)</a></li></ul>
</div>
-<p id="footer">run-script &mdash; npm@1.1.48</p>
+<p id="footer">run-script &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/scripts.html
@@ -177,7 +177,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/run-script.html">run-script(1)</a></li><li><a href="../doc/json.html">json(1)</a></li><li><a href="../doc/developers.html">developers(1)</a></li><li><a href="../doc/install.html">install(1)</a></li></ul>
</div>
-<p id="footer">scripts &mdash; npm@1.1.48</p>
+<p id="footer">scripts &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/search.html
@@ -24,7 +24,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/view.html">view(1)</a></li></ul>
</div>
-<p id="footer">search &mdash; npm@1.1.48</p>
+<p id="footer">search &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/semver.html
@@ -104,7 +104,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/json.html">json(1)</a></li></ul>
</div>
-<p id="footer">semver &mdash; npm@1.1.48</p>
+<p id="footer">semver &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/shrinkwrap.html
@@ -169,7 +169,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/install.html">install(1)</a></li><li><a href="../doc/json.html">json(1)</a></li><li><a href="../doc/list.html">list(1)</a></li></ul>
</div>
-<p id="footer">shrinkwrap &mdash; npm@1.1.48</p>
+<p id="footer">shrinkwrap &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/star.html
@@ -26,7 +26,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/view.html">view(1)</a></li><li><a href="../doc/whoami.html">whoami(1)</a></li><li><a href="../doc/adduser.html">adduser(1)</a></li></ul>
</div>
-<p id="footer">star &mdash; npm@1.1.48</p>
+<p id="footer">star &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/start.html
@@ -20,7 +20,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/run-script.html">run-script(1)</a></li><li><a href="../doc/scripts.html">scripts(1)</a></li><li><a href="../doc/test.html">test(1)</a></li><li><a href="../doc/restart.html">restart(1)</a></li><li><a href="../doc/stop.html">stop(1)</a></li></ul>
</div>
-<p id="footer">start &mdash; npm@1.1.48</p>
+<p id="footer">start &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/stop.html
@@ -20,7 +20,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/run-script.html">run-script(1)</a></li><li><a href="../doc/scripts.html">scripts(1)</a></li><li><a href="../doc/test.html">test(1)</a></li><li><a href="../doc/start.html">start(1)</a></li><li><a href="../doc/restart.html">restart(1)</a></li></ul>
</div>
-<p id="footer">stop &mdash; npm@1.1.48</p>
+<p id="footer">stop &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/submodule.html
@@ -33,7 +33,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/json.html">json(1)</a></li><li>git help submodule</li></ul>
</div>
-<p id="footer">submodule &mdash; npm@1.1.48</p>
+<p id="footer">submodule &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/tag.html
@@ -21,7 +21,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/publish.html">publish(1)</a></li><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/config.html">config(1)</a></li></ul>
</div>
-<p id="footer">tag &mdash; npm@1.1.48</p>
+<p id="footer">tag &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/test.html
@@ -23,7 +23,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/run-script.html">run-script(1)</a></li><li><a href="../doc/scripts.html">scripts(1)</a></li><li><a href="../doc/start.html">start(1)</a></li><li><a href="../doc/restart.html">restart(1)</a></li><li><a href="../doc/stop.html">stop(1)</a></li></ul>
</div>
-<p id="footer">test &mdash; npm@1.1.48</p>
+<p id="footer">test &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/uninstall.html
@@ -22,7 +22,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/prune.html">prune(1)</a></li><li><a href="../doc/install.html">install(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/config.html">config(1)</a></li></ul>
</div>
-<p id="footer">uninstall &mdash; npm@1.1.48</p>
+<p id="footer">uninstall &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/unpublish.html
@@ -34,7 +34,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/deprecate.html">deprecate(1)</a></li><li><a href="../doc/publish.html">publish(1)</a></li><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/adduser.html">adduser(1)</a></li><li><a href="../doc/owner.html">owner(1)</a></li></ul>
</div>
-<p id="footer">unpublish &mdash; npm@1.1.48</p>
+<p id="footer">unpublish &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/update.html
@@ -23,7 +23,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/install.html">install(1)</a></li><li><a href="../doc/outdated.html">outdated(1)</a></li><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/list.html">list(1)</a></li></ul>
</div>
-<p id="footer">update &mdash; npm@1.1.48</p>
+<p id="footer">update &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/version.html
@@ -40,7 +40,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/init.html">init(1)</a></li><li><a href="../doc/json.html">json(1)</a></li><li><a href="../doc/semver.html">semver(1)</a></li></ul>
</div>
-<p id="footer">version &mdash; npm@1.1.48</p>
+<p id="footer">version &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/view.html
@@ -88,7 +88,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/search.html">search(1)</a></li><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/docs.html">docs(1)</a></li></ul>
</div>
-<p id="footer">view &mdash; npm@1.1.48</p>
+<p id="footer">view &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
2  deps/npm/html/doc/whoami.html
@@ -20,7 +20,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
<ul><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/adduser.html">adduser(1)</a></li></ul>
</div>
-<p id="footer">whoami &mdash; npm@1.1.48</p>
+<p id="footer">whoami &mdash; npm@1.1.49</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
View
11 deps/npm/lib/adduser.js
@@ -1,8 +1,7 @@
module.exports = adduser
-var ini = require("./utils/ini.js")
- , log = require("npmlog")
+var log = require("npmlog")
, npm = require("./npm.js")
, registry = npm.registry
, read = require("read")
@@ -130,10 +129,10 @@ function save (c, u, cb) {
registry.username = u.u
registry.password = u.p
registry.email = u.e
- ini.set("username", u.u, "user")
- ini.set("_password", u.p, "user")
- ini.set("email", u.e, "user")
+ npm.config.set("username", u.u, "user")
+ npm.config.set("_password", u.p, "user")
+ npm.config.set("email", u.e, "user")
log.info("adduser", "Authorized user %s", u.u)
- ini.save("user", cb)
+ npm.config.save("user", cb)
})
}
View
8 deps/npm/lib/build.js
@@ -1,4 +1,3 @@
-
// npm build command
// everything about the installation after the creation of
@@ -62,8 +61,11 @@ function build_ (global, didPre, didRB) { return function (folder, cb) {
function writeBuiltinConf (folder, cb) {
// the builtin config is "sticky". Any time npm installs itself,
// it puts its builtin config file there, as well.
- var ini = require("./utils/ini.js")
- ini.saveConfig("builtin", path.resolve(folder, "npmrc"), cb)
+ if (!npm.config.usingBuiltin
+ || folder !== path.dirname(__dirname)) {
+ return cb()
+ }
+ npm.config.save("builtin", cb)
}
function linkStuff (pkg, folder, global, didRB, cb) {
View
4 deps/npm/lib/completion.js
@@ -5,7 +5,9 @@ completion.usage = "npm completion >> ~/.bashrc\n"
+ "npm completion >> ~/.zshrc\n"
+ "source <(npm completion)"
-var configDefs = require("./utils/config-defs.js")
+var npm = require("./npm.js")
+ , npmconf = require("npmconf")
+ , configDefs = npmconf.defs
, configTypes = configDefs.types
, shorthands = configDefs.shorthands
, nopt = require("nopt")
View
183 deps/npm/lib/config.js
@@ -9,13 +9,13 @@ config.usage = "npm config set <key> <value>"
+ "\nnpm set <key> <value>"
+ "\nnpm get [<key>]"
-var ini = require("./utils/ini.js")
- , log = require("npmlog")
+var log = require("npmlog")
, npm = require("./npm.js")
, exec = require("./utils/exec.js")
, fs = require("graceful-fs")
- , dc
- , types = require("./utils/config-defs.js").types
+ , npmconf = require("npmconf")
+ , types = npmconf.defs.types
+ , ini = require("ini")
config.completion = function (opts, cb) {
var argv = opts.conf.argv.remain
@@ -59,18 +59,17 @@ function config (args, cb) {
}
function edit (cb) {
- var e = ini.get("editor")
- , which = ini.get("global") ? "global" : "user"
- , f = ini.get(which + "config")
+ var e = npm.config.get("editor")
+ , which = npm.config.get("global") ? "global" : "user"
+ , f = npm.config.get(which + "config")
, eol = process.platform === "win32" ? "\r\n" : "\n"
if (!e) return cb(new Error("No EDITOR config or environ set."))
- ini.save(which, function (er) {
+ npm.config.save(which, function (er) {
if (er) return cb(er)
fs.readFile(f, "utf8", function (er, data) {
if (er) data = ""
- dc = dc || require("./utils/config-defs.js").defaults
data = [ ";;;;"
- , "; npm "+(ini.get("global") ?
+ , "; npm "+(npm.config.get("global") ?
"globalconfig" : "userconfig")+" file"
, "; this is a simple ini-formatted file"
, "; lines that start with semi-colons are comments."
@@ -83,8 +82,8 @@ function edit (cb) {
, ";;;;"
]
)
- .concat(Object.keys(dc).map(function (k) {
- return "; " + k + " = " + ini.unParseField(dc[k],k)
+ .concat(Object.keys(npmconf.defaults).map(function (k) {
+ return "; " + k + " = " + npmconf.defaults[k]
}))
.concat([""])
.join(eol)
@@ -94,13 +93,7 @@ function edit (cb) {
, "utf8"
, function (er) {
if (er) return cb(er)
- exec(e, [f], function (er) {
- if (er) return cb(er)
- ini.resolveConfigs(function (er) {
- if (er) return cb(er)
- ini.save(which, cb)
- })
- })
+ exec(e, [f], cb)
}
)
})
@@ -109,8 +102,9 @@ function edit (cb) {
function del (key, cb) {
if (!key) return cb(new Error("no key provided"))
- ini.del(key)
- ini.save(ini.get("global") ? "global" : "user", cb)
+ var where = npm.config.get("global") ? "global" : "user"
+ npm.config.del(key, where)
+ npm.config.save(where, cb)
}
function set (key, val, cb) {
@@ -129,9 +123,9 @@ function set (key, val, cb) {
key = key.trim()
val = val.trim()
log.info("config", "set %j %j", key, val)
- var where = ini.get("global") ? "global" : "user"
- ini.set(key, val, where)
- ini.save(where, cb)
+ var where = npm.config.get("global") ? "global" : "user"
+ npm.config.set(key, val, where)
+ npm.config.save(where, cb)
}
function get (key, cb) {
@@ -151,140 +145,127 @@ function reverse (a, b) {
return a > b ? -1 : 1
}
+function public (k) {
+ return !(k.charAt(0) === "_" || types[k] !== types[k])
+}
+
+function getKeys (data) {
+ return Object.keys(data).filter(public).sort(sort)
+}
+
function list (cb) {
var msg = ""
, long = npm.config.get("long")
- // cli configs.
- // show any that aren't secret
- var cli = ini.configList.list[ini.TRANS.cli]
- , eol = process.platform === "win32" ? "\r\n" : "\n"
- , cliKeys = Object.keys(cli).filter(function (k) {
- return !(k.charAt(0) === "_" || types[k] !== types[k])
- }).sort(function (a, b) {
- return a > b ? 1 : -1
- })
+ var cli = npm.config.sources.cli.data
+ , cliKeys = getKeys(cli)
if (cliKeys.length) {
- msg += "; cli configs" + eol
+ msg += "; cli configs\n"
cliKeys.forEach(function (k) {
if (cli[k] && typeof cli[k] === "object") return
if (k === "argv") return
- msg += k + " = " + JSON.stringify(cli[k]) + eol
+ msg += k + " = " + JSON.stringify(cli[k]) + "\n"
})
- msg += eol
+ msg += "\n"
}
// env configs
- var env = ini.configList.list[ini.TRANS.env]
- , envKeys = Object.keys(env).filter(function (k) {
- return !(k.charAt(0) === "_" || types[k] !== types[k])
- }).sort(function (a, b) {
- return a > b ? 1 : -1
- })
+ var env = npm.config.sources.env.data
+ , envKeys = getKeys(env)
if (envKeys.length) {
- msg += "; environment configs" + eol
+ msg += "; environment configs\n"
envKeys.forEach(function (k) {
- if (env[k] !== ini.get(k)) {
+ if (env[k] !== npm.config.get(k)) {