Skip to content

Commit b5e7c80

Browse files
committed
feat(config): add rc style configs
fixes #308 fixes #406
1 parent 3e06b1c commit b5e7c80

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ database.json
1010
*.sublime-project
1111
*.sublime-workspace
1212
archive
13+
.db-migraterc
1314

1415
# Vim swap files
1516
.*.sw[a-z]

.npmignore

+1
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ database.json
88
*.sublime-project
99
*.sublime-workspace
1010
archive
11+
.db-migraterc

api.js

+8-2
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,9 @@ dbmigrate.prototype = {
540540

541541
function setDefaultArgv(internals, isModule) {
542542

543+
var rc = require('rc');
544+
var deepExtend = require('deep-extend');
545+
543546
internals.argv = optimist
544547
.default({
545548
verbose: false,
@@ -558,7 +561,6 @@ function setDefaultArgv(internals, isModule) {
558561
'Usage: db-migrate [up|down|reset|sync|create|db|transition] ' +
559562
'[[dbname/]migrationName|all] [options]'
560563
)
561-
562564
.describe('env',
563565
'The environment to run the migrations under (dev, test, prod).')
564566
.alias('e', 'env')
@@ -636,6 +638,8 @@ function setDefaultArgv(internals, isModule) {
636638

637639
var plugins = internals.plugins;
638640
var plugin = plugins.hook('init:cli:config:hook');
641+
var _config = internals.argv.argv.config;
642+
639643
if(plugin) {
640644

641645
plugin.forEach(function(plugin) {
@@ -648,7 +652,9 @@ function setDefaultArgv(internals, isModule) {
648652
});
649653
}
650654

651-
internals.argv = internals.argv.argv;
655+
internals.argv = deepExtend(internals.argv.argv, rc('db-migrate', {}));
656+
internals.argv.rcconfig = internals.argv.config;
657+
internals.argv.config = _config;
652658

653659
if (internals.argv.version) {
654660
console.log(internals.dbm.version);

package.json

+2
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
"balanced-match": "^0.4.2",
4848
"bluebird": "^3.1.1",
4949
"db-migrate-shared": "^1.1.2",
50+
"deep-extend": "^0.4.1",
5051
"dotenv": "^2.0.0",
5152
"final-fs": "^1.6.0",
5253
"inflection": "^1.10.0",
@@ -56,6 +57,7 @@
5657
"parse-database-url": "~0.3.0",
5758
"pkginfo": "^0.4.0",
5859
"prompt": "^1.0.0",
60+
"rc": "^1.1.6",
5961
"resolve": "^1.1.6",
6062
"semver": "^5.3.0",
6163
"tunnel-ssh": "^4.0.0"

0 commit comments

Comments
 (0)