fix: support scoped packages; closes #3

.travis.yml

@@ -29,5 +29,4 @@ jobs:
       deploy:
         provider: script
         skip_cleanup: true
-        script:
-          - npx semantic-release
+        script: npx semantic-release

README.md

@@ -23,10 +23,10 @@ You _could_ install this, but you shouldn't have to. Use `npm` to install global
 ## Usage
 
 ```shell
-$ npm init yo <some-generator>
+$ npm init yo <some-generator>[:subgenerator]
 ```
 
-All Yeoman generator packages start with `generator-`; this prefix is _optional_. In other words, `npm init yo license` will work just as well as `npm init yo generator-license`.
+All Yeoman generator packages start with `generator-`; this prefix is _optional_ **unless you are using a scoped package**. In other words, `npm init yo license` will work just as well as `npm init yo generator-license`, but to use generator `@butts/generator-butts`, you must specify the complete package name with `npm init yo @butts/generator-butts`.
 
 See [a list of generators here](http://yeoman.io/generators/).
 

src/create-yo.js

@@ -32,25 +32,33 @@ async function create(
   }
 
   let generator = argv.pop();
-
-  let generatorPackage = generator.startsWith(PREFIX)
-    ? generator
-    : `${PREFIX}${generator}`;
-  let generatorName = generatorPackage.slice(PREFIX.length);
+  let generatorPackage;
+  let generatorName;
+  if (generator.startsWith('@')) {
+    // handle scoped packages
+    generatorName = generatorPackage = generator;
+  } else {
+    generatorPackage = generator.startsWith(PREFIX)
+      ? generator
+      : `${PREFIX}${generator}`;
+    generatorName = generatorPackage.slice(PREFIX.length);
+  }
 
   // handle subgenerators
   generatorPackage = generatorPackage.split(':').shift();
+
   return npx(
     npx.parseArgs(
-      argv.concat(
+      [
+        ...argv,
         '--package',
         'yo',
         '--package',
         generatorPackage,
         '--',
         'yo',
         generatorName
-      ),
+      ],
       npmPath
     )
   );

test/create-yo.spec.js

@@ -15,31 +15,29 @@ const {parseArgs} = importFrom(
 describe('create-yo', function() {
   let sandbox;
 
-  describe('failures', function() {
-    let libnpx;
-    let create;
+  let libnpx;
+  let create;
 
-    beforeEach(function() {
-      sandbox = sinon.createSandbox();
-      libnpx = sandbox.spy();
-      libnpx.parseArgs = parseArgs;
-      rewiremock.enable();
-      create = rewiremock.proxy('..', r => ({
-        'global-dirs': r.by(() => ({
-          npm: {
-            packages: '/path/to/global/packages',
-            binaries: '/path/to/global/binaries'
-          }
-        })),
-        'import-from': r.by(() => () => libnpx)
-      })).create;
-    });
+  beforeEach(function() {
+    sandbox = sinon.createSandbox();
+    libnpx = sandbox.spy();
+    libnpx.parseArgs = parseArgs;
+    create = rewiremock.proxy('..', r => ({
+      'global-dirs': r.by(() => ({
+        npm: {
+          packages: '/path/to/global/packages',
+          binaries: '/path/to/global/binaries'
+        }
+      })),
+      'import-from': r.by(() => () => libnpx)
+    })).create;
+  });
 
-    afterEach(function() {
-      sandbox.restore();
-      rewiremock.disable();
-    });
+  afterEach(function() {
+    sandbox.restore();
+  });
 
+  describe('failure', function() {
     describe('when no generator specified', function() {
       it('should fail', async function() {
         expect(
@@ -69,7 +67,9 @@ describe('create-yo', function() {
         });
       });
     });
+  });
 
+  describe('success', function() {
     describe('when subgenerator specified', function() {
       it('should ask npx for the parent generator but use the subgenerator', async function() {
         await create([
@@ -89,5 +89,71 @@ describe('create-yo', function() {
         });
       });
     });
+
+    describe('when scoped package specified', function() {
+      describe('when subgenerator specified', function() {
+        it('should ask npx for the parent generator but use the subgenerator', async function() {
+          await create([
+            '/path/to/node',
+            '/path/to/create-yo',
+            '@scoped-package/generator-some-generator:subgenerator'
+          ]);
+          expect(libnpx, 'to have a call satisfying', {
+            args: [
+              {
+                package: [
+                  'yo@latest',
+                  '@scoped-package/generator-some-generator@latest'
+                ],
+                command: 'yo',
+                cmdOpts: [
+                  '@scoped-package/generator-some-generator:subgenerator'
+                ],
+                npm: '/path/to/global/binaries/npm'
+              }
+            ]
+          });
+        });
+      });
+
+      it('should call libnpx with the correct parameters', async function() {
+        await create([
+          '/path/to/node',
+          '/path/to/create-yo',
+          '@scoped-package/generator-some-generator'
+        ]);
+        expect(libnpx, 'to have a call satisfying', {
+          args: [
+            {
+              package: [
+                'yo@latest',
+                '@scoped-package/generator-some-generator@latest'
+              ],
+              command: 'yo',
+              cmdOpts: ['@scoped-package/generator-some-generator'],
+              npm: '/path/to/global/binaries/npm'
+            }
+          ]
+        });
+      });
+    });
+
+    it('should call libnpx with the correct parameters', async function() {
+      await create([
+        '/path/to/node',
+        '/path/to/create-yo',
+        'generator-some-generator'
+      ]);
+      expect(libnpx, 'to have a call satisfying', {
+        args: [
+          {
+            package: ['yo@latest', 'generator-some-generator@latest'],
+            command: 'yo',
+            cmdOpts: ['some-generator'],
+            npm: '/path/to/global/binaries/npm'
+          }
+        ]
+      });
+    });
   });
 });