TheThing/nconf-lite
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
215 commits 1 branch 51 tags 722 KiB
Commit graph

215 commits

This branch
This branch
All branches
Author SHA1 Message Date
indexzero
f771500266 [dist] Semantic cleanup from sloppy coding in #76. 2014-11-26 01:02:59 -05:00
indexzero
ffce2cbec1 [dist] Update package.json versions. 2014-11-26 01:02:42 -05:00
Charlie Robbins
a3404b4062 Merge pull request #76 from jmonster/usage 
Resolves #64, usage and help
 2014-11-26 00:59:36 -05:00
Charlie Robbins
7b01b46313 Merge pull request #117 from MitchellMcKenna/master 
Update Readme to note additional nconf.file() calls require using a custom key
 2014-11-11 03:12:44 -05:00
Charlie Robbins
51a4fea561 Merge pull request #99 from meritt/patch-1 
Delete CHANGELOG.md
 2014-09-24 23:00:38 -04:00
Charlie Robbins
ddd4b616ee Merge pull request #102 from gabegorelick/tilde-versions 
Use ~ for dependencies
 2014-09-24 23:00:23 -04:00
Charlie Robbins
1602a9e1a3 Merge pull request #116 from Blooie/master 
fixing the tests
 2014-09-24 23:00:07 -04:00
Mitchell McKenna
6301d7d9c6 Update Readme; multiple file() needs custom key 
- Update the Readme with notes that when using multiple config files,
  the user must use a custom key as the first parameter in additional
  nconf.file() calls in order for config heirarchy/inheritance to work
  properly.

Fixes #97, Fixes #109, Fixes #110
 2014-06-17 17:56:42 -07:00
Chris Manson
f69e43a423 fixing the tests 2014-05-27 17:43:24 +01:00
Christopher Jeffrey
8105c761ad [fix] only reverse keys for "get" action to be safe. 2014-02-12 12:32:34 -06:00
Jarrett Cruger
999c6fbc6e Merge pull request #104 from flatiron/precedence_fix 
[fix] have latter stores precede the former stores again.
 2014-02-12 13:33:29 -05:00
Christopher Jeffrey
2241a36789 [fix] have latter stores precede the former stores again. 2014-02-12 12:26:38 -06:00
Jarrett Cruger
1bd1561cdd Merge pull request #103 from flatiron/precedence_fix 
[fix] have latter stores precede the former stores.
 2014-02-12 13:16:58 -05:00
Christopher Jeffrey
0bb89ee2b4 [fix] have latter stores precede the former stores. 2014-02-11 12:40:41 -06:00
Gabe Gorelick
43505a53ae Use ~ for dependencies 2014-02-05 10:42:15 -05:00
Jarrett Cruger
05d73de3d0 [fix] No need to test 0.6 anymore 2014-01-27 15:52:42 -05:00
Alexey Simonenko
9891814b27 Delete CHANGELOG.md 
Changelog not updated for more than 2 years, it is better to remove it so as not to mislead.
 2014-01-12 21:23:15 +03:00
Jarrett Cruger
022b9bc507 [dist] Version bump. 0.6.9 2013-12-01 22:23:41 -08:00
Jarrett Cruger
9aa33b565a [dist] bump optimist version, fixes #89 2013-12-01 22:22:24 -08:00
Jarrett Cruger
92311c81c3 [rm] kill pkginfo 2013-12-01 22:21:21 -08:00
Jarrett Cruger
c713936e8d [dist] bump async 2013-12-01 22:20:34 -08:00
Jarrett Cruger
cd81efac7e [dist] Version bump. 0.6.8 2013-10-29 14:50:10 -04:00
Jarrett Cruger
5f148d5aa5 Merge pull request #90 from midknight41/master 
added support for BOM in load() and loadSync(), fixed travis build too.
 2013-10-26 17:05:16 -07:00
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 #82 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
Johnny Domino
b73b0e1a37 attach help and showHelp arguments to the argv store 2013-02-23 12:33:23 -05:00
Johnny Domino
4894c8fcf7 resolves #64 passing usage string to optimist 2013-02-23 12:32:42 -05:00
Charlie Robbins
818526ca62 Merge pull request #63 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 #65 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 #67 from flatiron/gh-65 
Fix for #65
 2012-12-20 15:06:38 -08:00
indexzero
60456186d7 [fix] Fix for #65 2012-12-20 18:03:37 -05:00
indexzero
0d795ecf81 [test] Better tests to show #65 2012-12-20 14:08:36 -05:00
indexzero
f19f0b6c39 [test] Added failing test to illustrate #65 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 #62 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