Merge pull request #68 from samdemaeyer/switch-packagemanagername-whe…

…n-yarn-detected

switch the package managers name printed out when yarn.lock file is present

lib/dependency-checker.js

@@ -46,8 +46,15 @@ EmberCLIDependencyChecker.prototype.checkDependencies = function() {
   var unsatisfiedDeps = filteredDeps.filter(isNotSymlinked);
   var symlinkedDeps = filteredDeps.filter(isSymlinked);
 
-  this.reporter.reportUnsatisfiedSymlinkedPackages('npm', symlinkedDeps);
-  this.reporter.unsatisifedPackages('npm', unsatisfiedDeps);
+  var yarnPath = path.join(this.project.root, 'yarn.lock');
+
+  var packageManagerName = 'npm';
+  if (fileExists(yarnPath)) {
+    packageManagerName = 'yarn';
+  }
+
+  this.reporter.reportUnsatisfiedSymlinkedPackages(packageManagerName, symlinkedDeps);
+  this.reporter.unsatisifedPackages(packageManagerName, unsatisfiedDeps);
 
   if (unsatisfiedDeps.length === 0) {
     var shrinkWrapDeps = this.readShrinkwrapDeps();

lib/reporter.js

@@ -4,6 +4,8 @@ function installCommand(type) {
   switch (type) {
   case 'npm':
     return 'npm install';
+  case 'yarn':
+    return 'yarn';
   case 'npm-shrinkwrap':
     return 'rm -rf node_modules/ && npm install';
   case 'bower':

tests/fixtures/project-yarn-check/bower.json

@@ -0,0 +1,5 @@
+{
+  "name": "project-yarn-check",
+  "dependencies": {
+  }
+}

tests/fixtures/project-yarn-sibling-node-modules-check/app/bower.json

@@ -0,0 +1,5 @@
+{
+  "name": "project-yarn-check",
+  "dependencies": {
+  }
+}

tests/unit/dependency-checker-package-manager-test.js

@@ -0,0 +1,108 @@
+'use strict';
+
+var assertError   = require('../helpers/assert-error');
+var assertNoError = require('../helpers/assert-no-error');
+var DependencyChecker = require('../../lib/dependency-checker');
+var projectBuilder = require('../helpers/project-builder');
+
+describe('EmberCLIDependencyChecker', function() {
+  beforeEach(function(){
+    DependencyChecker.setAlreadyChecked(false);
+  });
+
+  packageManagerTest('yarn');
+  packageManagerTest('npm');
+
+  function packageManagerTest(packageManagerName) {
+    function createProject(dependencies, options) {
+      options = options || {};
+      options.root = options.root || 'tests/fixtures/project-' + packageManagerName + '-check';
+      options.dependencies = projectBuilder.buildDependencies(dependencies);
+      return projectBuilder.build(options);
+    }
+
+    var assertPackageManagerError = function(project) {
+      return assertError(project, packageManagerName);
+    };
+
+    var assertNoPackageManagerError = function(project) {
+      return assertNoError(project, packageManagerName);
+    };
+
+    describe('reports unsatisfied ' + packageManagerName + ' dependencies', function() {
+      it('when the specified package is not installed', function() {
+        var project = createProject({ 'foo': '0.1.1', 'ember-cli': '1.2.3' });
+        assertPackageManagerError(project);
+      });
+
+      it('when the installed package does not match the version specified', function() {
+        var project = createProject({ 'ember-cli': '0.1.1' });
+        assertPackageManagerError(project);
+      });
+
+      it('when the installed package does not satisfy the version range specified', function() {
+        var project = createProject({ 'ember-cli': '>1.3.2 <=2.3.4' });
+        assertPackageManagerError(project);
+      });
+
+      it('when the installed package is not compatible with the version specified', function() {
+        var project = createProject({ 'ember-cli': '0.2.x' });
+        assertPackageManagerError(project);
+      });
+
+      it('when the version specified is a Git repo with a semver tag and there is a version mismatch', function() {
+        var project = createProject({ 'ember-cli': 'git://github.com/stefanpenner/ember-cli.git#v0.1.0' });
+        assertPackageManagerError(project);
+      });
+    });
+
+    describe('does not report satisfied ' + packageManagerName + ' dependencies', function() {
+      it('when the installed package matches the version specified', function() {
+        var project = createProject({ 'ember-cli': '1.2.3' });
+        assertNoPackageManagerError(project);
+      });
+
+      it('when the installed package satisfies the version range specified', function() {
+        var project = createProject({ 'ember-cli': '>1.0.0' });
+        assertNoPackageManagerError(project);
+      });
+
+      it('when the installed package is compatible with the version specified', function() {
+        var project = createProject({ 'ember-cli': '^1.2.0' });
+        assertNoPackageManagerError(project);
+      });
+
+      it('when the version specified is a URL', function() {
+        var project = createProject({ 'ember-cli': 'http://ember-cli.com/ember-cli.tar.gz' });
+        assertNoPackageManagerError(project);
+      });
+
+      it('when the version specified is a Git repo with a non-semver tag', function() {
+        var project = createProject({ 'ember-cli': 'git://github.com/stefanpenner/ember-cli.git#master' });
+        assertNoPackageManagerError(project);
+      });
+
+      it('when the version specified is a local path', function() {
+        var project = createProject({ 'ember-cli': '~/projects/ember-cli' });
+        assertNoPackageManagerError(project);
+      });
+
+      it('does NOT error with a * dependency', function() {
+        var project = createProject({ 'ember-cli': '*' });
+        assertNoPackageManagerError(project);
+      });
+    });
+
+    describe('sibling node_modules/ directory', function() {
+      it('checks depdencies', function() {
+        var project = createProject({
+          'ember-cli': '*'
+        }, {
+          root: 'tests/fixtures/project-' + packageManagerName + '-sibling-node-modules-check/app',
+          nodeModulesPath: 'tests/fixtures/project-' + packageManagerName + '-sibling-node-modules-check/node_modules',
+        });
+        assertNoPackageManagerError(project);
+      });
+    });
+  }
+});