status-im/embark-area-51
2
0
Fork 0
mirror of https://github.com/status-im/embark-area-51.git synced 2025-02-22 20:18:22 +00:00
Code Issues Projects Releases Wiki Activity

display loading message when new libs are being installed

Browse Source
This commit is contained in:
Iuri Matias 2017-07-05 18:26:44 -04:00
parent 5a2cdb19bf
commit 2ed4eee831
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/contracts/compiler.js
View File

@ -69,7 +69,7 @@ class Compiler {
},
function loadCompiler(callback) {
// TODO: there ino need to load this twice
solcW = new SolcW(self.solcVersion);
solcW = new SolcW({logger: self.logger, solcVersion: self.solcVersion});
if (solcW.isCompilerLoaded()) {
return callback();
}

8
lib/contracts/solcW.js
View File

@ -1,14 +1,15 @@
let utils = require('../utils/utils.js');
let solcProcess;
let compilerLoaded = false;
var npm = require('../pipeline/npm.js');
var Npm = require('../pipeline/npm.js');
let path = require('path');
let currentSolcVersion = require('../../package.json').dependencies.solc;
class SolcW {
constructor(solcVersion) {
this.solcVersion = solcVersion;
constructor(options) {
this.solcVersion = options.solcVersion;
this.logger = options.logger;
}
load_compiler(done) {
@ -27,6 +28,7 @@ class SolcW {
if (this.solcVersion === currentSolcVersion) {
solcProcess.send({action: 'loadCompiler', solcLocation: 'solc'});
} else {
let npm = new Npm({logger: this.logger});
npm.getPackageVersion('solc', this.solcVersion, false, function(location) {
let requirePath = path.join(process.env.PWD, location);
solcProcess.send({action: 'loadCompiler', solcLocation: requirePath});

3
lib/core/config.js
View File

@ -2,7 +2,7 @@ var fs = require('./fs.js');
var File = require('./file.js');
var Plugins = require('./plugins.js');
var utils = require('../utils/utils.js');
var npm = require('../pipeline/npm.js');
var Npm = require('../pipeline/npm.js');
// TODO: add wrapper for fs so it can also work in the browser
// can work with both read and save
@ -240,6 +240,7 @@ Config.prototype.loadFiles = function(files) {
//if (false) {
//readFiles.push(new File({filename: 'web3-' + web3Version + '.js', type: 'custom', resolver: function(callback) {
readFiles.push(new File({filename: 'web3.js', type: 'custom', resolver: function(callback) {
let npm = new Npm({logger: self.logger});
npm.getPackageVersion('web3', web3Version, 'dist/web3.js', function(web3Content) {
callback(web3Content);
});

15
lib/pipeline/npm.js
View File

@ -6,8 +6,14 @@ let http = require('follow-redirects').http;
let https = require('follow-redirects').https;
var tar = require('tar');
module.exports = {
getPackageVersion: function(packageName, version, returnContent, callback) {
class Npm {
constructor(options) {
this.logger = options.logger;
}
getPackageVersion(packageName, version, returnContent, callback) {
let self = this;
let npmRegistry = "https://registry.npmjs.org/" + packageName + "/" + version;
utils.httpsGet(npmRegistry, function (res) {
@ -45,7 +51,7 @@ module.exports = {
}
} else {
fs.mkdirpSync(packageDirectory);
//self.logger.info("downloading " + packageName + " " + version + "....");
self.logger.info("downloading " + packageName + " " + version + "....");
download(tarball, packageDirectory + "/downloaded_package.tgz", function() {
o_fs.createReadStream(packageDirectory + '/downloaded_package.tgz').pipe(
@ -68,5 +74,6 @@ module.exports = {
});
});
}
};
}
module.exports = Npm;