Commit graph

305 commits

Author SHA1 Message Date
Joseph Page
d252288dae Merge commit '80195744af4929731ff1c87e9b29e37a2c48e464' into patch-1 2015-08-19 17:45:38 +02:00
Christian Murphy
be0ee00b2a Merge branch 'master' of https://github.com/indexzero/nconf into update-async 2015-08-19 08:03:38 -07:00
Christian Murphy
59056fe364 Update Async and ini 2015-08-19 07:58:50 -07:00
Joseph Page
a2b812f704 Add travis tests for iojs 2015-08-13 20:45:57 +02:00
Joseph Page
32d560c95d Add tests for node 0.12 2015-08-13 20:45:57 +02:00
Christian Murphy
80195744af Merge branch 'master' of https://github.com/indexzero/nconf into update-travis 2015-08-04 11:51:26 -07:00
indexzero
c2b8b97778 [dist] Version bump. 0.7.2 2015-08-04 10:31:48 -07:00
Remy Sharp
3c11ef50e5 fix: env.match test
The previous test was expecting the .match value to be a function rather than a regexp which is what the README shows. So I've fixed the code to match against a real regexp, and test if the stringified version of the regexp function is [object RegExp].

I've also updated the tests to prime the process.env with values that are specifically tested for to ensure it's correctly loading the env values.

Fixex indexzero/nconf#178
2015-08-04 10:30:33 -07:00
Olivier Lalonde
8a21ef36d5 env({lowerCase:true}) option to make it possible to get() keys in lower case 2015-08-04 18:56:43 +08:00
indexzero
372521b124 [doc] Add the badges!. 2015-07-29 17:16:12 -07:00
Jarrett Cruger
8afdf63497 Merge pull request #168 from ChristianMurphy/replace-optimist-with-yargs
Replace optimist with yargs
2015-07-12 19:34:18 -04:00
Nick Heiner
89dff39d55 Quick grammar fix 2015-07-09 14:07:35 -04:00
Pierre Beaujeu
339e59afd5 fix random fails on tests that use child process
Listen to 'close' event rather than 'exit' event which can be fired before
stdio is closed.
2015-07-09 17:33:52 +02:00
Christian Murphy
a65e1a3317 update async 2015-07-07 16:01:08 -07:00
Christian Murphy
a82b53941d update badge and use container build 2015-07-07 13:36:21 -07:00
Christian Murphy
80ec01b91d replace optimist with yargs 2015-07-07 13:06:41 -07:00
Gilad Peleg
e5b33ceb05 Add license attribute
https://docs.npmjs.com/files/package.json#license
http://npm1k.org/
2015-05-19 12:56:17 +03:00
Jarrett Cruger
d335b5a0f5 Merge pull request #141 from NickHeiner/patch-1
Grammar nit
2015-01-20 14:23:27 -05:00
Nick Heiner
6d86950914 Grammar nit 2015-01-20 13:41:46 -05:00
Jarrett Cruger
dc6aed2050 [dist] Version bump. 0.7.1 2014-11-26 12:52:01 -05:00
Jarrett Cruger
87a3b82418 [fix] we shouldnt be reversing here fixes #127 2014-11-26 12:51:33 -05:00
Jarrett Cruger
6271cdb35d Revert "fixing the tests"
This reverts commit f69e43a423.
2014-11-26 12:49:50 -05:00
indexzero
f0d5b6eb30 [dist] Fix travis. 2014-11-26 01:34:28 -05:00
indexzero
a2a132181a [dist] Version bump. 0.7.0 2014-11-26 01:32:16 -05:00
indexzero
352f07559a [dist] "Real" CHANGELOG.md again. 2014-11-26 01:32:00 -05:00
indexzero
af0e9fb7e7 [dist fix] Cleanup some whitespace. 2014-11-26 01:31:48 -05:00
indexzero
09342555ba [fix] Fixed regression introduced by #98. 2014-11-26 01:28:31 -05:00
indexzero
8d5fb25701 [fix] Fix my own sloppy coding fixing the sloppy coding from #76. 2014-11-26 01:14:44 -05:00
Charlie Robbins
5502f2cf98 Merge pull request #111 from martinheidegger/patch-1
Adding helpful information in case parsing failed.
2014-11-26 01:08:02 -05:00
Charlie Robbins
2496f59994 Merge pull request #100 from tommystanton/doc_improve
Add some documentation about File and Literal
2014-11-26 01:07:03 -05:00
indexzero
f07bc40d64 [fix] Fix inconsistent style from #98. 2014-11-26 01:06:44 -05:00
Charlie Robbins
d5bd26c0b6 Merge pull request #98 from joaoafrmartins/master
filter process.env by regexp
2014-11-26 01:06:11 -05:00
indexzero
0b8aa903c7 [fix test] Remove leftover console.log() from #79. 2014-11-26 01:05:06 -05:00
Charlie Robbins
c6d8f5d140 Merge pull request #79 from jfromaniello/master
Use optionally a different separator for memorystore
2014-11-26 01:04:35 -05:00
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
Martin Heidegger
c8b6c98c7a Adding helpful information in case parsing failed.
I stumbled over 2 slight problems of broken configuration files:

1) It said that a error in my JSON file existed (even though it was a yaml file, parsed by libyaml)
2) It didn't tell me which error occured.

both should be fixed with this PR
2014-03-09 21:40:10 +09: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