Skip to content

Commit

Permalink
Merge pull request #37 from Snugug/feature/plugin-options
Browse files Browse the repository at this point in the history
Feature/plugin options
  • Loading branch information
scottnath authored Jun 23, 2016
2 parents b12b13b + a3f0718 commit 520078e
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
10 changes: 9 additions & 1 deletion lib/content-types/merge.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,21 @@ const plugabilly = require('plugabilly');
const merge = require('deepmerge');
const uuid = require('uuid');
const _ = require('lodash');
const globalConfig = require('config');

const configPlugins = {};

/**
* Retrieve Input Plugins
*
* {Object} - [Plugabilly](https://github.com/Snugug/plugabilly) object
*/
const plugins = plugabilly().name().containsSync('input-plugin-');
if (globalConfig.hasOwnProperty('content')) {
if (globalConfig.content.hasOwnProperty('plugins')) {
configPlugins.search = globalConfig.content.directory;
}
}
const plugins = plugabilly(configPlugins).name().containsSync('input-plugin-');

/*
* Determine required level
Expand Down
3 changes: 2 additions & 1 deletion lib/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,6 @@ exports.singleItem = (key, value, arr) => {
* @param {string|object} value - The thing you want to log. Works best with deep nested {Object}s
*/
exports.log = (value) => {
console.log(util.inspect(value, false, null));
// Meant to console log this out here
console.log(util.inspect(value, false, null)); // eslint-disable-line no-console
};
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,14 @@
"js-yaml": "^3.5.3",
"lodash": "^4.13.1",
"node-dir": "^0.1.11",
"node-sass": "^3.4.2",
"nunjucks": "^2.4.0",
"plugabilly": "^0.0.1",
"uuid": "^2.0.2"
},
"devDependencies": {
"ava": "^0.15.1",
"coveralls": "^2.11.9",
"eslint": "^2",
"eslint": "^2.13.1",
"eslint-config-punchcard": "^1.0.0",
"ghooks": "^1.2.4",
"input-plugin-datetime": "^0.0.1",
Expand All @@ -55,7 +54,7 @@
"nyc": "^6.0.0",
"open-exchange-rates": "^0.3.0",
"punchcard-commit-msg": "^1.0.0",
"punchcard-semantic-release": "^2.0.0",
"punchcard-semantic-release": "^2.0.1",
"raw-loader": "^0.5.1",
"semantic-release": "^4.3.5",
"tap-diff": "^0.1.1"
Expand Down

0 comments on commit 520078e

Please sign in to comment.