Commit graph

243 commits

Author SHA1 Message Date
midknight41
6c1eb5e917 fixed white spacing and added (embarrassing absent) variable declarations 2013-10-26 20:40:12 +01:00
midknight41
ccd609c1c3 updated version of vows as v0.6 didn't work with node 0.10 2013-10-10 21:27:25 +01:00
midknight41
5546469061 updated .travis.yml as travis doesn't support node 0.4 or 0.9 2013-10-04 08:10:53 +01:00
midknight41
6641ed234a made bom tests more meaningful 2013-10-03 15:58:13 +01:00
midknight41
2ce8aea8fc made bom tests more meaningful 2013-10-03 15:53:02 +01:00
midknight41
f7733c1719 included bom test fixtures 2013-10-03 14:37:39 +01:00
midknight41
24f77a0edd included bom test fixtures 2013-10-03 14:37:07 +01:00
midknight41
29f1ca281b added support for BOM in load() and loadSync() 2013-10-03 09:17:36 +01:00
Charlie Robbins
62589145f3 Merge pull request from mfloryan/fileinfo
Fileinfo
2013-06-21 23:14:20 -07:00
Marcin Floryan
ada15db9e3 Test that invalid file name is indicated 2013-04-29 21:36:26 +01:00
Marcin Floryan
0135d95a06 Additional error information when JSON config file cannot be read 2013-04-29 16:34:48 +01:00
José F. Romaniello
039057c730 allow different separator for memorystore 2013-04-05 15:07:33 -03:00
Johnny Domino
b73b0e1a37 attach help and showHelp arguments to the argv store 2013-02-23 12:33:23 -05:00
Johnny Domino
4894c8fcf7 resolves passing usage string to optimist 2013-02-23 12:32:42 -05:00
Charlie Robbins
818526ca62 Merge pull request from SchoonologyRRL/patch-1
Updated Memory.merge to handle null values
2012-12-20 22:56:54 -08:00
Michael Schoonmaker
5d2ebfbe9f Added test to confirm merging an Object and null behaves as expected. 2012-12-20 19:02:36 -08:00
indexzero
d77c55d4ba [dist] Version bump. 0.6.7 2012-12-20 18:13:50 -05:00
Michael Hart
bb57c497d3 Prefer this fix for to 6045618 2012-12-20 18:12:42 -05:00
indexzero
aec2b4eb46 [dist] Version bump. 0.6.6 2012-12-20 18:07:16 -05:00
Charlie Robbins
e26f1af48c Merge pull request from flatiron/gh-65
Fix for 
2012-12-20 15:06:38 -08:00
indexzero
60456186d7 [fix] Fix for 2012-12-20 18:03:37 -05:00
indexzero
0d795ecf81 [test] Better tests to show 2012-12-20 14:08:36 -05:00
indexzero
f19f0b6c39 [test] Added failing test to illustrate 2012-12-20 14:01:04 -05:00
Maciej Małecki
bcbaf3a133 [dist] Bump version to 0.6.5 2012-11-02 18:17:08 +01:00
Maciej Małecki
8b65e195eb [test] Test on newer node versions 2012-11-02 18:09:17 +01:00
Michael Schoonmaker
ed41c51850 Updated Memory.merge to handle null values
Previously, if the Memory store was merged with an object containing a null value, the following Error occurred:

TypeError: Object.keys called on non-object
    at Function.keys (native)
    at Memory.merge (/.../node_modules/nconf/lib/nconf/stores/memory.js:199:17)
    at Memory.merge (/.../node_modules/nconf/lib/nconf/stores/memory.js:200:17)
    at Array.every (native)
    at Memory.merge (/.../node_modules/nconf/lib/nconf/stores/memory.js:199:29)
    at common.merge (/.../node_modules/nconf/lib/nconf/common.js:99:13)
    at Array.forEach (native)
    at common.merge (/.../node_modules/nconf/lib/nconf/common.js:98:22)
    at Array.forEach (native)
    at Object.common.merge (/.../node_modules/nconf/lib/nconf/common.js:97:8)

This commit prevents that.
2012-09-27 11:26:56 -07:00
Pavan Kumar Sunkara
2ba437807a Merge pull request from tellnes/loadFrom
Fix ini files for memory loadFrom option
2012-09-16 19:32:47 -07:00
Christian Tellnes
8e987b8d3d make it possible to use other formats than json in common.loadFiles and common.loadFilesSync 2012-09-16 17:45:00 +02:00
Bradley Meck
f9b24f1aa6 Merge pull request from flatiron/merge-null
[fix] null values should merge properly instead of throwing errors
2012-09-08 18:11:54 -07:00
Bradley Meck
da39d3cac3 [fix] null values should merge properly instead of throwing errors 2012-09-08 20:10:58 -05:00
Bradley Meck
f21557e783 Merge pull request from flatiron/root-actions
[fix]  root get/set should work via null/undefined as key
2012-09-07 12:10:56 -07:00
Bradley Meck
7421836387 [fix] heirarchy fixture file path wrong in tests 2012-09-07 09:40:15 -05:00
Bradley Meck
683f78918c [fix] root get/set should work via null/undefined as key 2012-09-07 09:29:30 -05:00
Joshua Holbrook
ec9a13e901 Merge pull request from eethann/master
Add docs for optimist options hash
2012-08-06 23:24:22 -07:00
Ethan Winn
0f092ab5a4 Added docs for options hash to optimist.
I had to dig a bit to figure out how to get options working on argv,
thought I'd save others the time.
2012-08-07 01:52:29 -04:00
indexzero
7279bc11b3 [dist] Version bump. 0.6.4 2012-07-10 03:21:06 -04:00
indexzero
d96d2544bc [fix] Fix regression introduced by 36e061c4bd 2012-07-10 03:16:54 -04:00
indexzero
7e8d9d6bce [test] Added failing test for .save() regression introduced by @russfrank in 36e061c4bd 2012-07-10 03:16:04 -04:00
indexzero
04e22303bd [minor doc] Update file header in test/provider-test.js 2012-07-10 03:14:00 -04:00
indexzero
c7c6b6f6ef [dist] Version bump. 0.6.3 2012-07-10 01:50:31 -04:00
indexzero
30734301e7 [api test doc] Make options to Provider.prototype.file take more flexible options 2012-07-10 01:50:18 -04:00
indexzero
8b53c12729 [minor] Use locally scoped path variable 2012-07-10 01:47:28 -04:00
indexzero
80a79733d3 [dist] Version bump. 0.6.2 2012-07-10 01:29:58 -04:00
indexzero
7515f66572 [fix] Ensure that all options are passed to Provider.prototype.add in Provider.prototype.file. Fixes
[doc] Update README.md and method documentation
[dist] Remove vim comments
2012-07-10 01:27:28 -04:00
indexzero
eeddb70f20 [dist] Version bump. 0.6.1 2012-07-08 01:40:33 -04:00
Pavan Kumar Sunkara
6dd2351991 Merge pull request from mhart/nested-env-configs
Add support for nested configs via env
2012-06-21 01:44:16 -07:00
Michael Hart
9aaafc5a22 Ugh, fixed whitespace 2012-06-21 18:05:52 +10:00
Michael Hart
3c08fad1c9 Changed to as it's more accurate 2012-06-21 18:04:37 +10:00
Michael Hart
e15f787940 Updated README and allowed a simpley syntax 2012-06-21 17:18:22 +10:00
Michael Hart
92d4e9ea14 Added test and updated docs 2012-06-21 17:04:06 +10:00