diff options
author | isaacs <i@izs.me> | 2013-02-06 06:46:28 +0400 |
---|---|---|
committer | isaacs <i@izs.me> | 2013-02-06 06:46:28 +0400 |
commit | e5efc479312dd01f87ae31df93a39778a7ab737f (patch) | |
tree | bc1e8b11c9e971433c400dc253a577e43cd0897c | |
parent | 383ef964b4dd4ad7cc373e08ca3e360dfed8544a (diff) |
npmconf@0.0.23
-rw-r--r-- | doc/cli/config.md | 2 | ||||
-rw-r--r-- | node_modules/npmconf/config-defs.js | 2 | ||||
-rw-r--r-- | node_modules/npmconf/node_modules/config-chain/node_modules/proto-list/package.json | 6 | ||||
-rw-r--r-- | node_modules/npmconf/node_modules/config-chain/package.json | 6 | ||||
-rw-r--r-- | node_modules/npmconf/package.json | 4 | ||||
-rw-r--r-- | node_modules/npmconf/x.diff | 26 |
6 files changed, 14 insertions, 32 deletions
diff --git a/doc/cli/config.md b/doc/cli/config.md index b2057a5da..3deafce5f 100644 --- a/doc/cli/config.md +++ b/doc/cli/config.md @@ -240,7 +240,7 @@ explicitly used, and that only GET requests use the cache. ### cache-min -* Default: 0 +* Default: 10 * Type: Number The minimum time (in seconds) to keep items in the registry cache before diff --git a/node_modules/npmconf/config-defs.js b/node_modules/npmconf/config-defs.js index 550f3197f..5acfd51a4 100644 --- a/node_modules/npmconf/config-defs.js +++ b/node_modules/npmconf/config-defs.js @@ -183,7 +183,7 @@ Object.defineProperty(exports, "defaults", {get: function () { , "cache-lock-wait": 10000 , "cache-max": Infinity - , "cache-min": 0 + , "cache-min": 10 , color : true , coverage: false diff --git a/node_modules/npmconf/node_modules/config-chain/node_modules/proto-list/package.json b/node_modules/npmconf/node_modules/config-chain/node_modules/proto-list/package.json index c024863c9..3bf94a79c 100644 --- a/node_modules/npmconf/node_modules/config-chain/node_modules/proto-list/package.json +++ b/node_modules/npmconf/node_modules/config-chain/node_modules/proto-list/package.json @@ -25,5 +25,9 @@ "readme": "A list of objects, bound by their prototype chain.\n\nUsed in npm's config stuff.\n", "readmeFilename": "README.md", "_id": "proto-list@1.2.2", - "_from": "proto-list@~1.2.1" + "dist": { + "shasum": "48b88798261ec2c4a785720cdfec6200d57d3326" + }, + "_from": "proto-list@~1.2.1", + "_resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.2.tgz" } diff --git a/node_modules/npmconf/node_modules/config-chain/package.json b/node_modules/npmconf/node_modules/config-chain/package.json index 76f0ef3dd..542010f6d 100644 --- a/node_modules/npmconf/node_modules/config-chain/package.json +++ b/node_modules/npmconf/node_modules/config-chain/package.json @@ -25,5 +25,9 @@ "readme": "#config-chain\n\nUSE THIS MODULE TO LOAD ALL YOUR CONFIGURATIONS\n\n``` js\n\n //npm install config-chain\n\n var cc = require('config-chain')\n , opts = require('optimist').argv //ALWAYS USE OPTIMIST FOR COMMAND LINE OPTIONS.\n , env = opts.env || process.env.YOUR_APP_ENV || 'dev' //SET YOUR ENV LIKE THIS.\n\n // EACH ARG TO CONFIGURATOR IS LOADED INTO CONFIGURATION CHAIN\n // EARLIER ITEMS OVERIDE LATER ITEMS\n // PUTS COMMAND LINE OPTS FIRST, AND DEFAULTS LAST!\n\n //strings are interpereted as filenames.\n //will be loaded synchronously\n\n var conf =\n cc(\n //OVERRIDE SETTINGS WITH COMMAND LINE OPTS\n opts,\n\n //ENV VARS IF PREFIXED WITH 'myApp_'\n\n cc.env('myApp_'), //myApp_foo = 'like this'\n\n //FILE NAMED BY ENV\n path.join(__dirname, 'config.' + env + '.json'),\n\n //IF `env` is PRODUCTION\n env === 'prod'\n ? path.join(__dirname, 'special.json') //load a special file\n : null //NULL IS IGNORED!\n\n //SUBDIR FOR ENV CONFIG\n path.join(__dirname, 'config', env, 'config.json'),\n\n //SEARCH PARENT DIRECTORIES FROM CURRENT DIR FOR FILE\n cc.find('config.json'),\n\n //PUT DEFAULTS LAST\n {\n host: 'localhost'\n port: 8000\n })\n\n var host = conf.get('host')\n\n // or\n\n var host = conf.store.host\n\n```\n\nFINALLY, EASY FLEXIBLE CONFIGURATIONS!\n\n##see also: [proto-list](https://github.com/isaacs/proto-list/)\n\nWHATS THAT YOU SAY?\n\nYOU WANT A \"CLASS\" SO THAT YOU CAN DO CRAYCRAY JQUERY CRAPS?\n\nEXTEND WITH YOUR OWN FUNCTIONALTY!?\n\n## CONFIGCHAIN LIVES TO SERVE ONLY YOU!\n\n```javascript\nvar cc = require('config-chain')\n\n// all the stuff you did before\nvar config = cc({\n some: 'object'\n },\n cc.find('config.json'),\n cc.env('myApp_')\n )\n // CONFIGS AS A SERVICE, aka \"CaaS\", aka EVERY DEVOPS DREAM OMG!\n .addUrl('http://configurator:1234/my-configs')\n // ASYNC FTW!\n .addFile('/path/to/file.json')\n\n // OBJECTS ARE OK TOO, they're SYNC but they still ORDER RIGHT\n // BECAUSE PROMISES ARE USED BUT NO, NOT *THOSE* PROMISES, JUST\n // ACTUAL PROMISES LIKE YOU MAKE TO YOUR MOM, KEPT OUT OF LOVE\n .add({ another: 'object' })\n\n // DIE A THOUSAND DEATHS IF THIS EVER HAPPENS!!\n .on('error', function (er) {\n // IF ONLY THERE WAS SOMETHIGN HARDER THAN THROW\n // MY SORROW COULD BE ADEQUATELY EXPRESSED. /o\\\n throw er\n })\n\n // THROW A PARTY IN YOUR FACE WHEN ITS ALL LOADED!!\n .on('load', function (config) {\n console.awesome('HOLY SHIT!')\n })\n```\n\n# BORING API DOCS\n\n## cc(...args)\n\nMAKE A CHAIN AND ADD ALL THE ARGS.\n\nIf the arg is a STRING, then it shall be a JSON FILENAME.\n\nSYNC I/O!\n\nRETURN THE CHAIN!\n\n## cc.json(...args)\n\nJoin the args INTO A JSON FILENAME!\n\nSYNC I/O!\n\n## cc.find(relativePath)\n\nSEEK the RELATIVE PATH by climbing the TREE OF DIRECTORIES.\n\nRETURN THE FOUND PATH!\n\nSYNC I/O!\n\n## cc.parse(content, file, type)\n\nParse the content string, and guess the type from either the\nspecified type or the filename.\n\nRETURN THE RESULTING OBJECT!\n\nNO I/O!\n\n## cc.env(prefix, env=process.env)\n\nGet all the keys on the provided env object (or process.env) which are\nprefixed by the specified prefix, and put the values on a new object.\n\nRETURN THE RESULTING OBJECT!\n\nNO I/O!\n\n## cc.ConfigChain()\n\nThe ConfigChain class for CRAY CRAY JQUERY STYLE METHOD CHAINING!\n\nOne of these is returned by the main exported function, as well.\n\nIt inherits (prototypically) from\n[ProtoList](https://github.com/isaacs/proto-list/), and also inherits\n(parasitically) from\n[EventEmitter](http://nodejs.org/api/events.html#events_class_events_eventemitter)\n\nIt has all the methods from both, and except where noted, they are\nunchanged.\n\n### LET IT BE KNOWN THAT chain IS AN INSTANCE OF ConfigChain.\n\n## chain.sources\n\nA list of all the places where it got stuff. The keys are the names\npassed to addFile or addUrl etc, and the value is an object with some\ninfo about the data source.\n\n## chain.addFile(filename, type, [name=filename])\n\nFilename is the name of the file. Name is an arbitrary string to be\nused later if you desire. Type is either 'ini' or 'json', and will\ntry to guess intelligently if omitted.\n\nLoaded files can be saved later.\n\n## chain.addUrl(url, type, [name=url])\n\nSame as the filename thing, but with a url.\n\nCan't be saved later.\n\n## chain.addEnv(prefix, env, [name='env'])\n\nAdd all the keys from the env object that start with the prefix.\n\n## chain.addString(data, file, type, [name])\n\nParse the string and add it to the set. (Mainly used internally.)\n\n## chain.add(object, [name])\n\nAdd the object to the set.\n\n## chain.root {Object}\n\nThe root from which all the other config objects in the set descend\nprototypically.\n\nPut your defaults here.\n\n## chain.set(key, value, name)\n\nSet the key to the value on the named config object. If name is\nunset, then set it on the first config object in the set. (That is,\nthe one with the highest priority, which was added first.)\n\n## chain.get(key, [name])\n\nGet the key from the named config object explicitly, or from the\nresolved configs if not specified.\n\n## chain.save(name, type)\n\nWrite the named config object back to its origin.\n\nCurrently only supported for env and file config types.\n\nFor files, encode the data according to the type.\n\n## chain.on('save', function () {})\n\nWhen one or more files are saved, emits `save` event when they're all\nsaved.\n\n## chain.on('load', function (chain) {})\n\nWhen the config chain has loaded all the specified files and urls and\nsuch, the 'load' event fires.\n", "readmeFilename": "readme.markdown", "_id": "config-chain@1.1.4", - "_from": "config-chain@~1.1.1" + "dist": { + "shasum": "db259108338667ca7cc16772d6feb8cf319dd317" + }, + "_from": "config-chain@~1.1.1", + "_resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.4.tgz" } diff --git a/node_modules/npmconf/package.json b/node_modules/npmconf/package.json index 0f3b5bd48..946db9808 100644 --- a/node_modules/npmconf/package.json +++ b/node_modules/npmconf/package.json @@ -1,6 +1,6 @@ { "name": "npmconf", - "version": "0.0.22", + "version": "0.0.23", "description": "The config thing npm uses", "main": "npmconf.js", "directories": { @@ -39,6 +39,6 @@ "license": "BSD", "readme": "# npmconf\n\nThe config thing npm uses\n\nIf you are interested in interacting with the config settings that npm\nuses, then use this module.\n\nHowever, if you are writing a new Node.js program, and want\nconfiguration functionality similar to what npm has, but for your\nown thing, then I'd recommend using [rc](https://github.com/dominictarr/rc),\nwhich is probably what you want.\n\nIf I were to do it all over again, that's what I'd do for npm. But,\nalas, there are many systems depending on many of the particulars of\nnpm's configuration setup, so it's not worth the cost of changing.\n\n## USAGE\n\n```javascript\nvar npmconf = require('npmconf')\n\n// pass in the cli options that you read from the cli\n// or whatever top-level configs you want npm to use for now.\nnpmconf.load({some:'configs'}, function (er, conf) {\n // do stuff with conf\n conf.get('some', 'cli') // 'configs'\n conf.get('username') // 'joebobwhatevers'\n conf.set('foo', 'bar', 'user')\n conf.save('user', function (er) {\n // foo = bar is now saved to ~/.npmrc or wherever\n })\n})\n```\n", "readmeFilename": "README.md", - "_id": "npmconf@0.0.22", + "_id": "npmconf@0.0.23", "_from": "npmconf@0" } diff --git a/node_modules/npmconf/x.diff b/node_modules/npmconf/x.diff deleted file mode 100644 index e1a8d3676..000000000 --- a/node_modules/npmconf/x.diff +++ /dev/null @@ -1,26 +0,0 @@ -From cc0b8826b94efb31f1f446a47afd2ee86ea6b5a4 Mon Sep 17 00:00:00 2001 -From: "Rob \"Hurricane\" Ashton" <robashton@codeofrob.com> -Date: Mon, 28 Jan 2013 15:09:36 +0000 -Subject: [PATCH] Added missing ini dependency - ---- - package.json | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/package.json b/package.json -index ec5f067..ff1b8d1 100644 ---- a/package.json -+++ b/package.json -@@ -13,7 +13,8 @@ - "mkdirp": "~0.3.3", - "osenv": "0.0.3", - "nopt": "2", -- "semver": "~1.1.0" -+ "semver": "~1.1.0", -+ "ini": "~1.1.0" - }, - "devDependencies": {}, - "scripts": { --- -1.7.10 - |