Skip to content

Commit

Permalink
Moved read-config and global-defaults to better named directories
Browse files Browse the repository at this point in the history
  • Loading branch information
slightlytyler committed Nov 7, 2015
1 parent 7f5a051 commit 5e73b0b
Show file tree
Hide file tree
Showing 9 changed files with 72 additions and 16 deletions.
10 changes: 10 additions & 0 deletions dist/config/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/config/global-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"];
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 _readConfig = require('../read-config');
var _tasksReadConfig = require('../tasks/read-config');

var _readConfig2 = _interopRequireDefault(_readConfig);
var _tasksReadConfig2 = _interopRequireDefault(_tasksReadConfig);

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, _readConfig2['default'])(_path2['default'].join(__blueprintRoot__, __blueprintType__, 'config.json'), function (blueprintConfigOptions) {
(0, _tasksReadConfig2['default'])(_path2['default'].join(__blueprintRoot__, __blueprintType__, 'config.json'), function (blueprintConfigOptions) {
var usePods = blueprintConfigOptions.forcePods || podsFlag;

// Computed __destinationRoot__ using config
Expand Down
20 changes: 10 additions & 10 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,6 @@ var _helpersString = require('./helpers/String');

var _helpersString2 = _interopRequireDefault(_helpersString);

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

var _readConfig2 = _interopRequireDefault(_readConfig);

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

var _globalConfigDefaults2 = _interopRequireDefault(_globalConfigDefaults);

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

var _help2 = _interopRequireDefault(_help);
Expand All @@ -35,6 +27,14 @@ var _generate = require('./generate');

var _generate2 = _interopRequireDefault(_generate);

var _tasksReadConfig = require('./tasks/read-config');

var _tasksReadConfig2 = _interopRequireDefault(_tasksReadConfig);

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

var _configGlobalDefaults2 = _interopRequireDefault(_configGlobalDefaults);

_commander2['default'].version('0.1.0').usage('<keywords> [options]').option('-p, --pod [pods flag]', 'Generates using the defined pods based file structure').option('--pods [pods flag alias]', 'Generates using the defined pods based file structure').on('--help', function () {
return _help2['default'].print();
}).parse(process.argv);
Expand All @@ -49,7 +49,7 @@ var anyArgs = function anyArgs() {
return !!args.length;
};

(0, _readConfig2['default'])('./.bluprintconfig', function (configOptions) {
(0, _tasksReadConfig2['default'])('./.bluprintconfig', function (configOptions) {
if (!anyArgs()) {
_commander2['default'].help();
} else {
Expand All @@ -59,4 +59,4 @@ var anyArgs = function anyArgs() {
_commander2['default'].help();
}
}
}, _globalConfigDefaults2['default']);
}, _configGlobalDefaults2['default']);
36 changes: 36 additions & 0 deletions dist/tasks/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'];
File renamed without changes.
2 changes: 1 addition & 1 deletion 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 readConfig from '../read-config';
import readConfig from '../tasks/read-config';
import serializeBlueprints from './tasks/serialize-blueprints';
import buildBoilerplate from './tasks/build-boilerplate';

Expand Down
4 changes: 2 additions & 2 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import { drop } from 'lodash';

import String from './helpers/String';

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

program
.version('0.1.0')
Expand Down
File renamed without changes.

0 comments on commit 5e73b0b

Please sign in to comment.