WIP #240 adding pacote for resolving package names

webgme · Apr 25, 2018 · fea13e6 · fea13e6
1 parent 1de7a6f
commit fea13e6
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 42 deletions.
diff --git a/index.js b/index.js
@@ -40,8 +40,9 @@ webgme.all.import = function(projectName, opts, callback) {
             });
             return deferred.promise;
         })
-        .then(() => {  // read in the webgme-cli config for the given project
-            projectName = opts.packageName || utils.getPackageName(projectName);
+        .then(() => utils.getPackageName(projectName))
+        .then(projectName => {  // read in the webgme-cli config for the given project
+            projectName = opts.packageName || projectName;
             projectName = projectName.toLowerCase();
             let configPath = utils.getConfigPath(projectName);
             let config = require(configPath);

diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
     "mkdirp": "^0.5.1",
     "mongo-uri": "^0.1.2",
     "nop": "^1.0.0",
-    "npm": "^3.8.9",
+    "pacote": "^7.6.1",
     "plural": "^0.1.6",
     "q": "^1.4.1",
     "ramda": "^0.15.1",

diff --git a/src/BaseManager.js b/src/BaseManager.js
@@ -4,7 +4,7 @@
 var _ = require('lodash'),
     path = require('path'),
     fs = require('fs'),
-    npm = require('npm'),
+    pacote = require('pacote'),
     rm_rf = require('rimraf'),
     exists = require('exists-file'),
     R = require('ramda'),

diff --git a/src/ComponentManager.js b/src/ComponentManager.js
@@ -139,18 +139,22 @@ ComponentManager.prototype.import = function(args, callback) {
     project = args.project;
 
     // Add the project to the package.json
-    var pkgProject = args.packageName || utils.getPackageName(project);
-    this._logger.info(`Adding ${componentName} from ${pkgProject}`);
+    const getPkgName = args.packageName ? Q(args.packageName) :
+        utils.getPackageName(project);
 
-    // Add the component to the webgme config component paths
-    // FIXME: Call this without --save then later save it
-    if (args.skipInstall) {
-        this._addComponentFromProject(componentName, pkgProject, callback);
-    } else {
-        utils.installProject(project, args.dev, (err, result) => {
+    return getPkgName.then(pkgProject => {
+        this._logger.info(`Adding ${componentName} from ${pkgProject}`);
+
+        // Add the component to the webgme config component paths
+        // FIXME: Call this without --save then later save it
+        if (args.skipInstall) {
             this._addComponentFromProject(componentName, pkgProject, callback);
-        });
-    }
+        } else {
+            utils.installProject(project, args.dev, (err, result) => {
+                this._addComponentFromProject(componentName, pkgProject, callback);
+            });
+        }
+    })
 };
 
 ComponentManager.prototype._addComponentFromProject = function(name, project, callback) {

diff --git a/src/utils.js b/src/utils.js
@@ -6,6 +6,7 @@ const spawn = childProcess.exec;
 const Logger = require('./Logger');
 const logger = new Logger();
 const PROJECT_CONFIG = 'webgme-setup.json';
+const pacote = require('pacote');
 
 var _ = require('lodash'),
     fs = require('fs'),
@@ -364,15 +365,10 @@ var getPathContaining = function(paths, item) {
  * @return {String} name
  */
 var getPackageName = function(npmPackage) {
-    // FIXME: It currently assumes everything is a github url. Should support
-    // hashes, packages, etc
-    // Ideally, we could use an npm feature to do this
-    if (npmPackage[0] === '.') {  // File path
-        return npmPackage.split(path.sep).pop();
-    }
-
-    // Github url: project/repo
-    return npmPackage.split('/').pop().replace(/#.*$/, '');
+    const options = {
+        cache: path.join(__dirname, '..', 'cache')
+    };
+    return pacote.manifest(npmPackage, options).then(pkg => pkg.name);
 };
 
 var loadPaths = function(requirejs) {

diff --git a/test/utils.spec.js b/test/utils.spec.js
@@ -53,31 +53,19 @@ describe('utils', function() {
         });
     });
 
-    describe('getPackageName', function() {
-        it('should resolve basic github repo', function() {
-            var name = utils.getPackageName('webgme/formula');
-            assert.equal(name, 'formula');
-        });
+    describe.only('getPackageName', function() {
+        before(() => this.timeout(5000));
 
-        it('should resolve github repo w/ branch', function() {
-            var name = utils.getPackageName('webgme/formula#router_update');
-            assert.equal(name, 'formula');
+        it('should resolve basic github repo', function() {
+            return utils.getPackageName('webgme/formula')
+                .then(name => assert.equal(name, 'formula'));
         });
 
         it('should resolve relative file path', function() {
-            var name = utils.getPackageName('../webgme/formula');
-            assert.equal(name, 'formula');
+            return utils.getPackageName('./test/res/MismatchPkgName/')
+                .then(name => assert.equal(name, 'somename'));
         });
 
-        it('should resolve absolute file path', function() {
-            var name = utils.getPackageName('/home/brian/projects/webgme/formula');
-            assert.equal(name, 'formula');
-        });
-
-        it('should file path from home dir', function() {
-            var name = utils.getPackageName('~/projects/webgme/formula');
-            assert.equal(name, 'formula');
-        });
     });
 
     after(function(done) {