Merge pull request #480 from SBoudrias/assert

Replace throwing if statement with assertion

lib/base.js

@@ -3,6 +3,7 @@ var fs = require('fs');
 var util = require('util');
 var path = require('path');
 var events = require('events');
+var assert = require('assert');
 var _ = require('lodash');
 var async = require('async');
 var findup = require('findup-sync');
@@ -73,13 +74,8 @@ var Base = module.exports = function Base(args, options) {
   this.options = options || {};
 
   // checks required paramaters
-  if (!this.options.env) {
-    throw new Error('You must provide the environment object. Use env#create() to create a new generator.');
-  }
-
-  if (!this.options.resolved) {
-    throw new Error('You must provide the resolved path value. Use env#create() to create a new generator.');
-  }
+  assert(this.options.env, 'You must provide the environment object. Use env#create() to create a new generator.');
+  assert(this.options.resolved, 'You must provide the resolved path value. Use env#create() to create a new generator.');
 
   this.env = this.options.env;
   this.resolved = this.options.resolved;
@@ -314,9 +310,7 @@ Base.prototype.run = function run(args, cb) {
 
   var methods = Object.keys(Object.getPrototypeOf(this));
 
-  if (!methods.length) {
-    throw new Error('This Generator is empty. Add at least one method for it to be runned.');
-  }
+  assert(methods.length, 'This Generator is empty. Add at least one method for it to be runned.');
 
   this.env.runLoop.once('end', function () {
     self.emit('end');
@@ -454,11 +448,7 @@ Base.prototype.hookFor = function hookFor(name, config) {
   config = config || {};
 
   // enforce use of hookFor during instantiation
-  if (this._running) {
-    return this.emit('error', new Error(
-      'hookFor must be used within the constructor only'
-    ));
-  }
+  assert(!this._running, 'hookFor can only be used inside the constructor function');
 
   // add the corresponding option to this class, so that we output these hooks
   // in help

lib/util/conflicter.js

@@ -3,6 +3,7 @@
 var fs = require('fs');
 var path = require('path');
 var events = require('events');
+var assert = require('assert');
 var async = require('async');
 var isBinaryFile = require('isbinaryfile');
 var util = require('util');
@@ -23,13 +24,8 @@ Conflicter.prototype.add = function add(conflict) {
     };
   }
 
-  if (!conflict.file) {
-    throw new Error('Missing conflict.file option');
-  }
-
-  if (conflict.content === undefined) {
-    throw new Error('Missing conflict.content option');
-  }
+  assert(conflict.file, 'Missing conflict.file option');
+  assert(conflict.content !== undefined, 'Missing conflict.content option');
 
   this.conflicts.push(conflict);
   return this;

lib/util/storage.js

@@ -1,6 +1,7 @@
 'use strict';
 var fs = require('fs');
 var path = require('path');
+var assert = require('assert');
 var EventEmitter = require('events').EventEmitter;
 var _ = require('lodash');
 var util = require('util');
@@ -26,9 +27,7 @@ var util = require('util');
 var Storage = module.exports = function Storage(name, configPath) {
   EventEmitter.call(this);
 
-  if (!name) {
-    throw new Error('A name parameter is required to create a storage');
-  }
+  assert(name, 'A name parameter is required to create a storage');
 
   this.path = configPath || path.join(process.cwd(), '.yo-rc.json');
   this.name = name;
@@ -108,9 +107,7 @@ Storage.prototype.getAll = function () {
  */
 
 Storage.prototype.set = function (key, val) {
-  if (_.isFunction(val)) {
-    throw new Error('Storage value can\'t be a function');
-  }
+  assert(!_.isFunction(val), 'Storage value can\'t be a function');
 
   if (_.isObject(key)) {
     _.extend(this._store, key);
@@ -139,9 +136,7 @@ Storage.prototype.delete = function (key) {
  */
 
 Storage.prototype.defaults = function (defaults) {
-  if (!_.isObject(defaults)) {
-    throw new Error('Storage `defaults` method only accept objects');
-  }
+  assert(_.isObject(defaults), 'Storage `defaults` method only accept objects');
   var val = _.defaults(this.getAll(), defaults);
   this.set(val);
 };