Merge ae7f337 into 7476892

blueprints/http-mock/index.js

@@ -1,6 +1,6 @@
 /*jshint node:true*/
-
 var Blueprint = require('../../lib/models/blueprint');
+var isPackageMissing = require('../../lib/utilities/is-package-missing');
 
 module.exports = {
   description: 'Generates a mock api endpoint in /api prefix.',
@@ -25,9 +25,13 @@ module.exports = {
     return serverBlueprint.install(options);
   },
 
-  afterInstall: function() {
-    return this.addPackagesToProject([
-      { name: 'express', target: '^4.8.5' }
-    ]);
+  afterInstall: function(options) {
+
+    if (!options.dryRun && isPackageMissing(this, 'express')) {
+      return this.addPackagesToProject([
+        { name: 'express', target: '^4.8.5' }
+      ]);  
+    } 
+
   }
 };

blueprints/server/index.js

@@ -1,14 +1,30 @@
 /*jshint node:true*/
+var isPackageMissing = require('../../lib/utilities/is-package-missing');
 
 module.exports = {
   description: 'Generates a server directory for mocks and proxies.',
 
   normalizeEntityName: function() {},
 
-  afterInstall: function() {
-    return this.addPackagesToProject([
-      { name: 'morgan', target: '^1.3.2' },
-      { name: 'glob', target: '^4.0.5' }
-    ]);
+  afterInstall: function(options) {
+
+    var isMorganMissing = isPackageMissing(this, 'morgan');
+    var isGlobMissing = isPackageMissing(this, 'glob');
+
+    var areDependenciesMissing = isMorganMissing || isGlobMissing;
+    var libsToInstall = [];
+
+    if (isMorganMissing) {
+      libsToInstall.push({ name: 'morgan', target: '^1.3.2' });
+    }
+
+    if (isGlobMissing) {
+      libsToInstall.push({ name: 'glob', target: '^4.0.5' });
+    }
+
+    if (!options.dryRun && areDependenciesMissing) {
+      return this.addPackagesToProject(libsToInstall);	
+    }
+
   }
 };

lib/utilities/is-package-missing.js

@@ -0,0 +1,19 @@
+'use strict';
+
+/*
+ *
+ * Given the context and library that's supposed to be looked up in the package.json,
+ * this method detects if its already available.
+ *
+ * @method isPackageMissing
+ * @param context The context of the method its called from (ie., this)
+ * @param packageName The package that's supposed to be looked up
+ * @return Boolean 
+ *
+ */
+module.exports = function (context, packageName) {
+  var pkgContent = context.project.pkg;
+  var isAvailableInDevDependency = pkgContent.devDependencies && pkgContent.devDependencies[packageName];
+  var isAvailableInDependency = pkgContent.dependencies && pkgContent.dependencies[packageName];
+  return !(isAvailableInDevDependency || isAvailableInDependency);
+};

tests/unit/utilities/is-package-missing-tests.js

@@ -0,0 +1,47 @@
+'use strict';
+
+var expect = require('chai').expect;
+var isPackageMissing  = require('../../../lib/utilities/is-package-missing');
+
+
+var getContext = function(setDevDependency, setDependency) {
+  var context = {
+    project: {
+      pkg: {}
+    }
+  };
+
+  if (setDevDependency) {
+    context.project.pkg['devDependencies'] = {
+      'sivakumar': 'kailasam'
+    };
+  }
+
+  if (setDependency) {
+    context.project.pkg['dependencies'] = {
+      'sivakumar': 'kailasam'
+    };
+  }
+  return context;
+};
+
+
+describe('Is package missing in package.json', function() {
+
+  it('Package is declared in dependencies', function() {
+    expect(isPackageMissing(getContext(false, true), 'sivakumar')).to.be.false;
+  });
+
+  it('Package is declared in dev dependencies', function() {
+    expect(isPackageMissing(getContext(true, false), 'sivakumar')).to.be.false;
+  });
+
+  it('Package is declared in both dependencies and dev dependencies', function() {
+   expect(isPackageMissing(getContext(true, true), 'sivakumar')).to.be.false;
+  });
+
+  it('Package is missing', function() {
+   expect(isPackageMissing(getContext(false, false), 'sivakumar')).to.be.true;
+  });
+
+});