Fix generating the generator

Using `namespace` leads to `this.options.namespace === 'generator:subgenerator'` instead of `this.options.namespace === 'app'`
yeoman · Dec 3, 2016 · a9fc6c5 · a9fc6c5
1 parent f66b24b
commit a9fc6c5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/app/index.js b/app/index.js
@@ -56,7 +56,7 @@ module.exports = class extends Generator {
     });
 
     this.composeWith(require.resolve('../subgenerator'), {
-      namespace: 'app'
+      name: 'app'
     });
   }
 

diff --git a/subgenerator/index.js b/subgenerator/index.js
@@ -7,10 +7,15 @@ module.exports = class extends Generator {
   constructor(args, opts) {
     super(args, opts);
 
-    this.option('namespace', {
+    this.log('arguments', arguments);
+    this.log('args', args);
+    this.log('opts', opts);
+    this.log(' this.options.name', this.options.name);
+
+    this.option('name', {
       type: String,
       required: true,
-      desc: 'Generator namespace'
+      desc: 'Generator name'
     });
   }
 
@@ -19,7 +24,7 @@ module.exports = class extends Generator {
 
     this.fs.copyTpl(
       this.templatePath('index.js'),
-      this.destinationPath(path.join('generators', this.options.namespace, 'index.js')),
+      this.destinationPath(path.join('generators', this.options.name, 'index.js')),
       {
         // Escape apostrophes from superb to not conflict with JS strings
         superb: superb().replace('\'', '\\\''),
@@ -29,14 +34,14 @@ module.exports = class extends Generator {
 
     this.fs.copy(
       this.templatePath('templates/**'),
-      this.destinationPath(path.join('generators', this.options.namespace, 'templates'))
+      this.destinationPath(path.join('generators', this.options.name, 'templates'))
     );
 
     this.fs.copyTpl(
       this.templatePath('test.js'),
-      this.destinationPath('test/' + this.options.namespace + '.js'),
+      this.destinationPath('test/' + this.options.name + '.js'),
       {
-        namespace: this.options.namespace,
+        name: this.options.name,
         generatorName: generatorName
       }
     );

diff --git a/subgenerator/templates/test.js b/subgenerator/templates/test.js
@@ -3,9 +3,9 @@ var path = require('path');
 var assert = require('yeoman-assert');
 var helpers = require('yeoman-test');
 
-describe('<%- generatorName %>:<%- namespace %>', function () {
+describe('<%- generatorName %>:<%- name %>', function () {
   before(function () {
-    return helpers.run(path.join(__dirname, '../generators/<%- namespace %>'))
+    return helpers.run(path.join(__dirname, '../generators/<%- name %>'))
       .withPrompts({someAnswer: true})
       .toPromise();
   });

diff --git a/test/subgenerator.js b/test/subgenerator.js
@@ -17,8 +17,10 @@ describe('generator:subgenerator', function () {
     });
 
     return helpers.run(path.join(__dirname, '../subgenerator'))
-      .withArguments(['foo'])
-      .withOptions({force: true})
+      .withOptions({
+        name: 'foo',
+        force: true
+      })
       .inTmpDir(function (tmpDir) {
         fs.writeFileSync(
           path.join(tmpDir, 'package.json'),