Skip to content

Commit

Permalink
Use single readConfig function
Browse files Browse the repository at this point in the history
  • Loading branch information
slightlytyler committed Nov 2, 2015
1 parent 459d913 commit 6e14b39
Show file tree
Hide file tree
Showing 11 changed files with 101 additions and 61 deletions.
6 changes: 3 additions & 3 deletions dist/generate/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ var _colors = require('colors');

var _colors2 = _interopRequireDefault(_colors);

var _tasksReadBlueprintConfig = require('./tasks/read-blueprint-config');
var _readConfig = require('../read-config');

var _tasksReadBlueprintConfig2 = _interopRequireDefault(_tasksReadBlueprintConfig);
var _readConfig2 = _interopRequireDefault(_readConfig);

var _tasksSerializeBlueprints = require('./tasks/serialize-blueprints');

Expand Down Expand Up @@ -67,7 +67,7 @@ function generate(args, podsFlag, globalConfigOptions) {
var __blueprintType__ = args[0];
var __blueprintTypePlur__ = __blueprintType__.plural();

(0, _tasksReadBlueprintConfig2['default'])(_path2['default'].join(__blueprintRoot__, __blueprintType__), function (blueprintConfigOptions) {
(0, _readConfig2['default'])(_path2['default'].join(__blueprintRoot__, __blueprintType__, 'config.json'), function (blueprintConfigOptions) {
var usePods = blueprintConfigOptions.forcePods || podsFlag;

// Computed __destinationRoot__ using config
Expand Down
10 changes: 10 additions & 0 deletions dist/global-config-defaults.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
"use strict";

Object.defineProperty(exports, "__esModule", {
value: true
});
exports["default"] = {
"rootDirectory": "app",
"blueprintsDirectory": "blueprints"
};
module.exports = exports["default"];
10 changes: 10 additions & 0 deletions dist/globalConfigDefaults.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
"use strict";

Object.defineProperty(exports, "__esModule", {
value: true
});
exports["default"] = {
"rootDirectory": "app",
"blueprintsDirectory": "blueprints"
};
module.exports = exports["default"];
12 changes: 8 additions & 4 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,13 @@ var _inflection = require('inflection');

var _inflection2 = _interopRequireDefault(_inflection);

var _readGlobalConfig = require('./read-global-config');
var _readConfig = require('./read-config');

var _readGlobalConfig2 = _interopRequireDefault(_readGlobalConfig);
var _readConfig2 = _interopRequireDefault(_readConfig);

var _globalConfigDefaults = require('./global-config-defaults');

var _globalConfigDefaults2 = _interopRequireDefault(_globalConfigDefaults);

var _help = require('./help');

Expand Down Expand Up @@ -74,7 +78,7 @@ var anyArgs = function anyArgs() {
return !!args.length;
};

(0, _readGlobalConfig2['default'])(function (configOptions) {
(0, _readConfig2['default'])('./.bluprintconfig', function (configOptions) {
if (!anyArgs()) {
_commander2['default'].help();
} else {
Expand All @@ -84,4 +88,4 @@ var anyArgs = function anyArgs() {
_commander2['default'].help();
}
}
});
}, _globalConfigDefaults2['default']);
36 changes: 36 additions & 0 deletions dist/read-config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
'use strict';

Object.defineProperty(exports, '__esModule', {
value: true
});
exports['default'] = readConfig;

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }

var _fs = require('fs');

var _fs2 = _interopRequireDefault(_fs);

// Example
//
// {
// "rootDirectory": "dummy/app",
// "podsDirectory": "pods",
// "blueprintsDirectory": "dummy/pods"
// }

function readConfig(__dir__, callback) {
var defaults = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];

_fs2['default'].readFile(__dir__, 'utf8', function (err, data) {
if (err) {
callback(defaults);
} else {
var options = Object.assign(defaults, JSON.parse(data));

callback(options);
}
});
}

module.exports = exports['default'];
4 changes: 2 additions & 2 deletions src/generate/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import chalk from 'chalk';
import chip from 'chip';
import colors from 'colors';

import readBlueprintConfig from './tasks/read-blueprint-config';
import readConfig from '../read-config';
import serializeBlueprints from './tasks/serialize-blueprints';
import buildBoilerplate from './tasks/build-boilerplate';

Expand Down Expand Up @@ -42,7 +42,7 @@ export default function generate(args, podsFlag, globalConfigOptions) {
const __blueprintType__ = args[0];
const __blueprintTypePlur__ = __blueprintType__.plural()

readBlueprintConfig(path.join(__blueprintRoot__, __blueprintType__), blueprintConfigOptions => {
readConfig(path.join(__blueprintRoot__, __blueprintType__, 'config.json'), blueprintConfigOptions => {
const usePods = blueprintConfigOptions.forcePods || podsFlag;

// Computed __destinationRoot__ using config
Expand Down
24 changes: 0 additions & 24 deletions src/generate/tasks/read-blueprint-config.js

This file was deleted.

4 changes: 4 additions & 0 deletions src/global-config-defaults.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export default {
"rootDirectory": "app",
"blueprintsDirectory": "blueprints"
}
7 changes: 4 additions & 3 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import path from 'path';
import { drop } from 'lodash';
import inflection from 'inflection';

import readGlobalConfig from './read-global-config';
import readConfig from './read-config';
import globalConfigDefaults from './global-config-defaults';
import help from './help';
import generate from './generate';

Expand Down Expand Up @@ -51,7 +52,7 @@ const podsFlag = pod || pods;

const anyArgs = () => !!args.length;

readGlobalConfig(configOptions => {
readConfig('./.bluprintconfig', configOptions => {
if(!anyArgs()) {
program.help();
} else {
Expand All @@ -61,4 +62,4 @@ readGlobalConfig(configOptions => {
program.help();
}
}
});
}, globalConfigDefaults);
24 changes: 24 additions & 0 deletions src/read-config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import fs from 'fs';

// Example
//
// {
// "rootDirectory": "dummy/app",
// "podsDirectory": "pods",
// "blueprintsDirectory": "dummy/pods"
// }

export default function readConfig(__dir__, callback, defaults = {}) {
fs.readFile(__dir__, 'utf8', function (err, data) {
if (err) {
callback(defaults)
} else {
const options = Object.assign(
defaults,
JSON.parse(data)
);

callback(options);
}
});
}
25 changes: 0 additions & 25 deletions src/read-global-config.js

This file was deleted.

0 comments on commit 6e14b39

Please sign in to comment.