Skip to content

Commit 782044e

Browse files
iurimatiasiurimatias
authored
Merge pull request #375 from embark-framework/fix_package_management
Fix package management
2 parents f6479d6 + b4129e9 commit 782044e

File tree

12 files changed

+22
-111
lines changed

12 files changed

+22
-111
lines changed

‎chains.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎lib/core/config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Config.prototype.loadBlockchainConfigFile = function() {
112112

113113
Config.prototype.loadContractsConfigFile = function() {
114114
var defaultVersions = {
115-
"web3.js": "1.0.0-beta",
115+
"web3": "1.0.0-beta",
116116
"solc": "0.4.17"
117117
};
118118
var versions = utils.recursiveMerge(defaultVersions, this.embarkConfig.versions || {});

‎lib/versions/library_manager.js‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class LibraryManager {
2121
this.versions = {};
2222

2323
let solcVersionInConfig = this.contractsConfig.versions.solc;
24-
let web3VersionInConfig = this.contractsConfig.versions["web3.js"];
24+
let web3VersionInConfig = this.contractsConfig.versions["web3"];
2525
let ipfsApiVersion = this.storageConfig.versions["ipfs-api"];
2626

2727
this.versions['solc'] = solcVersionInConfig;
@@ -64,10 +64,7 @@ class LibraryManager {
6464
listenToCommandsToGetLibrary() {
6565
let npm = new Npm({logger: this.embark.logger});
6666
this.embark.events.setCommandHandler('version:getPackageLocation', (libName, version, cb) => {
67-
npm.getPackageVersion(libName, version, false, false, cb);
68-
});
69-
this.embark.events.setCommandHandler('version:getPackageContent', (libName, version, cb) => {
70-
npm.getPackageVersion(libName, version, false, true, cb);
67+
npm.getPackageVersion(libName, version, cb);
7168
});
7269
}
7370

‎lib/versions/npm.js‎

Lines changed: 10 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,113 +1,26 @@
1-
// here be dragons
2-
// TODO: this is horrible and needs to be refactored ASAP
3-
let utils = require('../utils/utils.js');
41
let fs = require('../core/fs.js');
52

3+
let PluginManager = require('live-plugin-manager').PluginManager;
4+
65
class Npm {
76

87
constructor(options) {
98
this.logger = options.logger;
109
}
1110

12-
downloadFromGit(registryJSON, packageName, version, returnContent, callback) {
13-
let repoName = registryJSON.repository.url.replace("git+https://github.com/", "").replace(".git","");
14-
let gitHead = registryJSON.gitHead;
15-
16-
if (!gitHead) {
17-
this.logger.error("Could not download " + packageName + " " + version);
18-
return callback("error");
19-
}
20-
21-
let fileLocation = "https://raw.githubusercontent.com/" + repoName + "/" + gitHead + "/dist/web3.min.js";
22-
23-
let packageDirectory = './.embark/versions/' + packageName + '/' + version + '/';
24-
if (fs.existsSync(packageDirectory + "/" + packageName + ".js")) {
25-
if (returnContent) {
26-
let distFile = packageDirectory + packageName + ".js";
27-
callback(null, fs.readFileSync(distFile).toString());
28-
} else {
29-
callback(null, packageDirectory);
30-
}
31-
} else {
32-
fs.mkdirpSync(packageDirectory);
33-
this.logger.info("downloading " + packageName + " " + version + "....");
34-
35-
utils.downloadFile(fileLocation, packageDirectory + "/" + packageName + ".js", function() {
36-
utils.extractTar(packageDirectory + "/" + packageName + ".js", packageDirectory, function() {
37-
if (returnContent) {
38-
let distFile = packageDirectory + packageName + ".js";
39-
callback(null, fs.readFileSync(distFile).toString());
40-
} else {
41-
callback(null, packageDirectory);
42-
}
43-
});
44-
});
45-
}
46-
}
47-
48-
downloadFromNpm(registryJSON, packageName, version, returnContent, callback) {
49-
let tarball = registryJSON.dist.tarball;
50-
11+
getPackageVersion(packageName, version, callback) {
5112
let packageDirectory = './.embark/versions/' + packageName + '/' + version + '/';
52-
if (fs.existsSync(packageDirectory + "/downloaded_package.tgz") && fs.existsSync(packageDirectory + "package.json")) {
53-
if (returnContent) {
54-
let distFile = packageDirectory + returnContent;
55-
callback(null, fs.readFileSync(distFile).toString());
56-
} else {
57-
callback(null, packageDirectory);
58-
}
59-
} else {
60-
fs.mkdirpSync(packageDirectory);
61-
this.logger.info("downloading " + packageName + " " + version + "....");
62-
63-
utils.downloadFile(tarball, packageDirectory + "/downloaded_package.tgz", function() {
64-
utils.extractTar(packageDirectory + "/downloaded_package.tgz", packageDirectory, function() {
65-
if (returnContent) {
66-
let distFile = packageDirectory + returnContent;
67-
callback(null, fs.readFileSync(distFile).toString());
68-
} else {
69-
callback(null, packageDirectory);
70-
}
71-
});
72-
});
73-
}
74-
}
7513

76-
// TODO: callback should accept an error
77-
getPackageVersion(packageName, version, returnContent, getFromGit, callback) {
78-
let self = this;
79-
let npmRegistry = "https://registry.npmjs.org/" + packageName + "/" + version;
80-
let packageDirectory = './.embark/versions/' + packageName + '/' + version + '/';
14+
let manager = new PluginManager({pluginsPath: packageDirectory});
8115

82-
if (fs.existsSync(packageDirectory) && fs.existsSync(packageDirectory + "package.json")) {
83-
let content;
84-
if (getFromGit && returnContent) {
85-
let distFile = packageDirectory + packageName + ".js";
86-
content = fs.readFileSync(distFile).toString();
87-
} else if (returnContent) {
88-
let distFile = packageDirectory + returnContent;
89-
content = fs.readFileSync(distFile).toString();
90-
} else {
91-
content = packageDirectory;
92-
}
93-
return callback(null, content);
16+
if (fs.existsSync(packageDirectory + packageName)) {
17+
return callback(null, packageDirectory + packageName);
9418
}
9519

96-
utils.httpsGet(npmRegistry, function (err, body) {
97-
if (err) {
98-
if (err.code === 'ENOTFOUND') {
99-
return callback("can't reach " + err.hostname + " to download " + packageName + " " + version + " - are you connected to the internet?");
100-
}
101-
return callback(err);
102-
}
103-
let registryJSON = JSON.parse(body);
104-
105-
if (getFromGit) {
106-
self.downloadFromGit(registryJSON, packageName, version, returnContent, callback);
107-
} else {
108-
self.downloadFromNpm(registryJSON, packageName, version, returnContent, callback);
109-
}
110-
});
20+
this.logger.info("downloading " + packageName + " " + version + "....");
21+
manager.install(packageName, version).then((result) => {
22+
callback(null , result.location);
23+
}).catch(callback);
11124
}
11225
}
11326

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
"globule": "^1.1.0",
4444
"http-shutdown": "^1.2.0",
4545
"ipfs-api": "17.2.4",
46+
"live-plugin-manager": "https://github.com/iurimatias/live-plugin-manager.git",
4647
"merge": "^1.2.0",
4748
"mocha": "^2.2.5",
4849
"orbit-db": "^0.17.3",

‎templates/boilerplate/embark.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"buildDir": "dist/",
1010
"config": "config/",
1111
"versions": {
12-
"web3.js": "1.0.0-beta",
12+
"web3": "1.0.0-beta",
1313
"solc": "0.4.17",
1414
"ipfs-api": "17.2.4"
1515
},

‎templates/demo/embark.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"buildDir": "dist/",
99
"config": "config/",
1010
"versions": {
11-
"web3.js": "1.0.0-beta",
11+
"web3": "1.0.0-beta",
1212
"solc": "0.4.17",
1313
"ipfs-api": "17.2.4"
1414
},

‎test/config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ describe('embark.Config', function () {
3838
it('should load contract config correctly', function () {
3939
config.loadContractsConfigFile();
4040
let expectedConfig = {
41-
versions: {'web3.js': '1.0.0-beta', solc: '0.4.17'},
41+
versions: {'web3': '1.0.0-beta', solc: '0.4.17'},
4242
deployment: {host: 'localhost', port: 8545, type: 'rpc'},
4343
dappConnection: ['$WEB3', 'localhost:8545'],
4444
"gas": "auto",

‎test_apps/contracts_app/contracts.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"default": {
33
"versions": {
4-
"web3.js": "1.0.0-beta.27",
4+
"web3": "1.0.0-beta.27",
55
"solc": "0.4.17"
66
},
77
"deployment": {

‎test_apps/contracts_app/embark.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"webserver": false
1010
},
1111
"versions": {
12-
"web3.js": "1.0.0-beta",
12+
"web3": "1.0.0-beta",
1313
"solc": "0.4.17"
1414
}
1515
}

0 commit comments

Comments
 (0)