embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #547 from embark-framework/contracts_api_fix 

Contracts api fix
This commit is contained in:
Iuri Matias 2018-06-18 11:38:27 -04:00 committed by GitHub
parent a0a2d16cb3 231e48cecb
commit b7d6bc1c45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/core/config.js
View File

@ -31,6 +31,13 @@ var Config = function(options) {
self.events.setCommandHandler("config:contractsFiles", (cb) => {
cb(self.contractsFiles);
});
// TODO: refactor this so reading the file can be done with a normal resolver or something that takes advantage of the plugin api
self.events.setCommandHandler("config:contractsFiles:add", (filename) => {
self.contractsFiles.push(new File({filename: filename, type: File.types.custom, path: filename, resolver: function(callback) {
callback(fs.readFileSync(filename).toString());
}}));
});
};
Config.prototype.loadConfigFiles = function(options) {
@ -376,6 +383,7 @@ Config.prototype.loadFiles = function(files) {
return readFiles;
};
// NOTE: this doesn't work for internal modules
Config.prototype.loadPluginContractFiles = function() {
var self = this;

3
lib/core/plugin.js
View File

@ -139,6 +139,9 @@ Plugin.prototype.addFileToPipeline = function(file, intendedPath, options) {
};
Plugin.prototype.addContractFile = function(file) {
if (this.isInternal) {
throw new Error("this API cannot work for internal modules. please use an event command instead: config:contractsFiles:add");
}
this.contractsFiles.push(file);
this.addPluginType('contractFiles');
};

3
lib/core/plugins.js
View File

@ -1,6 +1,7 @@
const async = require('async');
var Plugin = require('./plugin.js');
var utils = require('../utils/utils.js');
var fs = require('../core/fs.js');
var Plugins = function(options) {
this.pluginList = options.plugins || [];
@ -53,7 +54,7 @@ Plugins.prototype.createPlugin = function(pluginName, pluginConfig) {
};
Plugins.prototype.loadInternalPlugin = function(pluginName, pluginConfig) {
var pluginPath = utils.joinPath('../modules/', pluginName, 'index.js');
var pluginPath = fs.embarkPath('lib/modules/' + pluginName);
var plugin = require(pluginPath);
var pluginWrapper = new Plugin({