From 41f04234d0c6965298f14ea28e509b4639f4ce9e Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Fri, 20 Apr 2018 19:52:51 -0400 Subject: [PATCH] clean up --- lib/contracts/code_generator.js | 1 - lib/core/config.js | 1 - lib/versions/library_manager.js | 7 +- lib/versions/npm.js | 138 ++------------------------------ 4 files changed, 6 insertions(+), 141 deletions(-) diff --git a/lib/contracts/code_generator.js b/lib/contracts/code_generator.js index 7e43697d1..c33846279 100644 --- a/lib/contracts/code_generator.js +++ b/lib/contracts/code_generator.js @@ -279,7 +279,6 @@ class CodeGenerator { async.waterfall([ function getWeb3Location(next) { self.events.request("version:get:web3", function(web3Version) { - console.dir("event request for web3 " + web3Version); if (web3Version === "1.0.0-beta") { return next(null, fs.embarkPath("js/web3-1.0.min.js")); } else { diff --git a/lib/core/config.js b/lib/core/config.js index 913b36667..1042eaa7f 100644 --- a/lib/core/config.js +++ b/lib/core/config.js @@ -117,7 +117,6 @@ Config.prototype.loadContractsConfigFile = function() { "solc": "0.4.17" }; var versions = utils.recursiveMerge(defaultVersions, this.embarkConfig.versions || {}); - console.dir(versions); var configObject = { "default": { diff --git a/lib/versions/library_manager.js b/lib/versions/library_manager.js index 13ab87d65..05bf2879a 100644 --- a/lib/versions/library_manager.js +++ b/lib/versions/library_manager.js @@ -63,13 +63,8 @@ class LibraryManager { listenToCommandsToGetLibrary() { let npm = new Npm({logger: this.embark.logger}); - // the installed package e.g solc this.embark.events.setCommandHandler('version:getPackageLocation', (libName, version, cb) => { - npm.getPackageVersion(libName, version, false, false, cb); - }); - // only the file e.g dist/web3.js - this.embark.events.setCommandHandler('version:getFileLocation', (libName, version, cb) => { - npm.getPackageVersion(libName, version, false, true, cb); + npm.getPackageVersion(libName, version, cb); }); } diff --git a/lib/versions/npm.js b/lib/versions/npm.js index e983b24b0..f248385e7 100644 --- a/lib/versions/npm.js +++ b/lib/versions/npm.js @@ -1,5 +1,3 @@ -// here be dragons -// TODO: this is horrible and needs to be refactored ASAP let utils = require('../utils/utils.js'); let fs = require('../core/fs.js'); @@ -11,58 +9,10 @@ class Npm { this.logger = options.logger; } - downloadFromGit(registryJSON, packageName, version, returnContent, callback) { - console.dir("==== downloadFromGit "); - console.dir(arguments); - - - - callback(null, ""); - } - - old_downloadFromGit(registryJSON, packageName, version, returnContent, callback) { - let repoName = registryJSON.repository.url.replace("git+https://github.com/", "").replace(".git",""); - let gitHead = registryJSON.gitHead; - console.dir(registryJSON); - - if (!gitHead) { - this.logger.error("Could not download " + packageName + " " + version); - return callback("error"); - } - - let fileLocation = "https://raw.githubusercontent.com/" + repoName + "/" + gitHead + "/dist/web3.min.js"; - console.dir("fileLocation is " + fileLocation); - + getPackageVersion(packageName, version, callback) { + let self = this; + let npmRegistry = "https://registry.npmjs.org/" + packageName + "/" + version; let packageDirectory = './.embark/versions/' + packageName + '/' + version + '/'; - console.dir("packageDirectory is " + packageDirectory); - if (fs.existsSync(packageDirectory + "/" + packageName + ".js")) { - if (returnContent) { - let distFile = packageDirectory + packageName + ".js"; - callback(null, fs.readFileSync(distFile).toString()); - } else { - callback(null, packageDirectory); - } - } else { - fs.mkdirpSync(packageDirectory); - this.logger.info("downloading " + packageName + " " + version + "...."); - - utils.downloadFile(fileLocation, packageDirectory + "/" + packageName + ".js", function() { - utils.extractTar(packageDirectory + "/" + packageName + ".js", packageDirectory, function() { - if (returnContent) { - let distFile = packageDirectory + packageName + ".js"; - callback(null, fs.readFileSync(distFile).toString()); - } else { - callback(null, packageDirectory); - } - }); - }); - } - } - - - downloadFromNpm(packageName, version, returnContent, callback) { - let packageDirectory = './.embark/versions/' + packageName + '/' + version + '/'; - console.dir("packageDirectory: " + packageDirectory); let manager = new PluginManager({pluginsPath: packageDirectory}); @@ -72,86 +22,8 @@ class Npm { this.logger.info("downloading " + packageName + " " + version + "...."); manager.install(packageName, version).then((result) => { - console.dir("== result"); - console.dir(result); - if (returnContent) { - callback(null , fs.readFileSync(result.mainFile).toString()); - } else { - callback(null , result.location); - } - }).catch((error) => { - console.dir("======> error"); - console.dir(error); - callback(error); - }); - } - - old_downloadFromNpm(registryJSON, packageName, version, returnContent, callback) { - let tarball = registryJSON.dist.tarball; - - let packageDirectory = './.embark/versions/' + packageName + '/' + version + '/'; - if (fs.existsSync(packageDirectory + "/downloaded_package.tgz") && fs.existsSync(packageDirectory + "package.json")) { - if (returnContent) { - let distFile = packageDirectory + returnContent; - callback(null, fs.readFileSync(distFile).toString()); - } else { - callback(null, packageDirectory); - } - } else { - fs.mkdirpSync(packageDirectory); - this.logger.info("downloading " + packageName + " " + version + "...."); - - utils.downloadFile(tarball, packageDirectory + "/downloaded_package.tgz", function() { - utils.extractTar(packageDirectory + "/downloaded_package.tgz", packageDirectory, function() { - if (returnContent) { - let distFile = packageDirectory + returnContent; - callback(null, fs.readFileSync(distFile).toString()); - } else { - callback(null, packageDirectory); - } - }); - }); - } - } - - // TODO: callback should accept an error - getPackageVersion(packageName, version, returnContent, getFromGit, callback) { - console.dir(arguments); - let self = this; - let npmRegistry = "https://registry.npmjs.org/" + packageName + "/" + version; - let packageDirectory = './.embark/versions/' + packageName + '/' + version + '/'; - - self.downloadFromNpm(packageName, version, returnContent, callback); - - //if (fs.existsSync(packageDirectory) && fs.existsSync(packageDirectory + "package.json")) { - // let content; - // if (getFromGit && returnContent) { - // let distFile = packageDirectory + packageName + ".js"; - // content = fs.readFileSync(distFile).toString(); - // } else if (returnContent) { - // let distFile = packageDirectory + returnContent; - // content = fs.readFileSync(distFile).toString(); - // } else { - // content = packageDirectory; - // } - // return callback(null, content); - //} - - //utils.httpsGet(npmRegistry, function (err, body) { - // if (err) { - // if (err.code === 'ENOTFOUND') { - // return callback("can't reach " + err.hostname + " to download " + packageName + " " + version + " - are you connected to the internet?"); - // } - // return callback(err); - // } - // let registryJSON = JSON.parse(body); - - // if (getFromGit) { - // self.downloadFromGit(registryJSON, packageName, version, returnContent, callback); - // } else { - // self.downloadFromNpm(registryJSON, packageName, version, returnContent, callback); - // } - //}); + callback(null , result.location); + }).catch(callback); } }