Merge pull request #99 from mansona/fix-at-syntax

Fixing issue with npm ci when dependency is defined as tar.gz url

Author: quaertym

lib/dependency-checker.js

@@ -119,6 +119,10 @@ class EmberCLIDependencyChecker {
         version = pkgContent.version || null;
         if (isTarGz(versionSpecified)) {
           version = pkgContent._from || unknownVersion;
+          if (version.includes('@')) {
+            // use the bit after the '@'
+            version = version.split('@')[1]
+          }
         }
       } catch(e) {
         // JSON parse error

tests/fixtures/project-npm-tar-gz-at-check/node_modules/example-tar-gz/package.json

@@ -112,6 +112,11 @@ describe('EmberCLIDependencyChecker', function() {
         const project = createProject({ 'example-tar-gz': 'http://ember-cli.com/example-2.0.0.tar.gz' }, { root: 'tests/fixtures/project-'+ packageManagerName + '-tar-gz-check' });
         assertNoPackageManagerError(project);
       });
+
+      it('when the version specified is a url to a tar.gz and a _from is provided in the package.json with the package-name@ prefix and urls match', function() {
+        const project = createProject({ 'example-tar-gz': 'http://ember-cli.com/example-2.0.0.tar.gz' }, { root: 'tests/fixtures/project-'+ packageManagerName + '-tar-gz-at-check' });
+        assertNoPackageManagerError(project);
+      });
     });
 
     describe('sibling node_modules/ directory', function() {