Update composeWith to take path or namespace as first argument - Fix #…

…983

lib/index.js

@@ -491,14 +491,11 @@ Base.prototype.run = function run(cb) {
  * this.composeWith('bootstrap', { sass: true });
  *
  * @example <caption>Using a direct dependency generator</caption>
- * this.composeWith('bootstrap', { sass: true }, {
- *   local: require.resolve('generator-bootstrap/app/main.js')
- * });
+ * this.composeWith(require.resolve('generator-bootstrap/app/main.js'), { sass: true });
  */
 
-Base.prototype.composeWith = function composeWith(namespace, options, settings) {
+Base.prototype.composeWith = function composeWith(modulePath, options) {
   var generator;
-  settings = settings || {};
   options = options || {};
 
   // Pass down the default options so they're correclty mirrored down the chain.
@@ -509,13 +506,17 @@ Base.prototype.composeWith = function composeWith(namespace, options, settings)
     'skip-cache': this.options.skipCache
   }, options);
 
-  if (settings.local) {
-    var Generator = require(settings.local);
-    Generator.resolved = require.resolve(settings.local);
-    Generator.namespace = namespace;
+  try {
+    var Generator = require(modulePath);
+    Generator.resolved = require.resolve(modulePath);
+    Generator.namespace = this.env.namespace(modulePath);
     generator = this.env.instantiate(Generator, {options: options});
-  } else {
-    generator = this.env.create(namespace, {options: options});
+  } catch (err) {
+    if (err.code === 'MODULE_NOT_FOUND') {
+      generator = this.env.create(modulePath, {options: options});
+    } else {
+      throw err;
+    }
   }
 
   if (this._running) {

test/base.js

@@ -792,25 +792,21 @@ describe('Base', function () {
     describe('when passing a local path to a generator', function () {
       beforeEach(function () {
         this.spy = sinon.spy();
-        this.stubPath = path.join(__dirname, 'fixtures/mocha-generator');
+        this.stubPath = path.join(__dirname, 'fixtures/generator-mocha');
         this.LocalDummy = Base.extend({ exec: this.spy });
         mockery.registerMock(this.stubPath, this.LocalDummy);
       });
 
       it('runs the composed generator', function (done) {
-        this.dummy.composeWith('dumb', {}, { local: this.stubPath });
+        this.dummy.composeWith(this.stubPath, {});
         this.dummy.run(function () {
           assert(this.LocalDummy.prototype.exec.called);
           done();
         }.bind(this));
       });
 
       it('pass options and arguments to the composed generators', function (done) {
-        this.dummy.composeWith(
-          'dumb',
-          { foo: 'bar', 'skip-install': true },
-          { local: this.stubPath }
-        );
+        this.dummy.composeWith(this.stubPath, { foo: 'bar', 'skip-install': true });
 
         this.dummy.run(function () {
           assert.equal(this.spy.firstCall.thisValue.options.foo, 'bar');
@@ -819,9 +815,9 @@ describe('Base', function () {
       });
 
       it('sets correct metadata on the Generator constructor', function (done) {
-        this.dummy.composeWith('dumb', {}, { local: this.stubPath });
+        this.dummy.composeWith(this.stubPath, {});
         this.dummy.run(function () {
-          assert.equal(this.spy.firstCall.thisValue.options.namespace, 'dumb');
+          assert.equal(this.spy.firstCall.thisValue.options.namespace, 'mocha');
           assert.equal(
             this.spy.firstCall.thisValue.options.resolved,
             require.resolve(this.stubPath)

test/fixtures/mocha-generator-base/package.json → test/fixtures/generator-mocha/package.json

@@ -1,6 +1,6 @@
 {
   "author": "",
-  "name": "mocha-generator",
+  "name": "generator-mocha",
   "version": "0.0.0",
   "main": "main.js",
   "dependencies": {},