From 1c38f3fb89ff37d1bef150c38b3c0cb83dc9df4c Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Sat, 30 Dec 2017 18:25:59 -0500
Subject: [PATCH] move lib

---
 lib/modules/solidity/solcW.js     |  2 +-
 lib/versions/library_manager.js   | 10 +++++++---
 lib/{pipeline => versions}/npm.js |  0
 3 files changed, 8 insertions(+), 4 deletions(-)
 rename lib/{pipeline => versions}/npm.js (100%)

diff --git a/lib/modules/solidity/solcW.js b/lib/modules/solidity/solcW.js
index 2cadd8697..92e8c4ebe 100644
--- a/lib/modules/solidity/solcW.js
+++ b/lib/modules/solidity/solcW.js
@@ -29,7 +29,7 @@ class SolcW {
       if (solcVersion === currentSolcVersion) {
         solcProcess.send({action: 'loadCompiler', solcLocation: 'solc'});
       } else {
-        self.events.request("version:getPackage:solc", solcVersion, function(err, location) {
+        self.events.request("version:getPackageLocation:solc", solcVersion, function(err, location) {
           if (err) {
             return done(err);
           }
diff --git a/lib/versions/library_manager.js b/lib/versions/library_manager.js
index d9020bb38..c60f647f3 100644
--- a/lib/versions/library_manager.js
+++ b/lib/versions/library_manager.js
@@ -1,4 +1,4 @@
-var Npm = require('../pipeline/npm.js');
+var Npm = require('./npm.js');
 
 class LibraryManager {
 
@@ -53,10 +53,14 @@ class LibraryManager {
   }
 
   listenToCommandsToGetLibrary() {
+    // TODO: generalize to any lib
     let libName = "solc";
     let npm = new Npm({logger: this.embark.logger});
-    this.embark.events.setCommandHandler('version:getPackage:' + libName, (version, cb) => {
-      npm.getPackageVersion('solc', version, false, false, cb);
+    this.embark.events.setCommandHandler('version:getPackageLocation:' + libName, (version, cb) => {
+      npm.getPackageVersion(libName, version, false, false, cb);
+    });
+    this.embark.events.setCommandHandler('version:getPackageContent:' + libName, (version, cb) => {
+      npm.getPackageVersion(libName, version, false, true, cb);
     });
   }
 
diff --git a/lib/pipeline/npm.js b/lib/versions/npm.js
similarity index 100%
rename from lib/pipeline/npm.js
rename to lib/versions/npm.js