support scoped projects using --directory

Author: Kelly Selden

src/get-start-and-end-commands.js

@@ -89,13 +89,17 @@ async function isDefaultAddonBlueprint(blueprint) {
 
 function getArgs({
   projectName,
+  directoryName,
   blueprint
 }) {
   let args = [];
 
   if (blueprint.isBaseBlueprint) {
     args.push('new');
     args.push(projectName);
+    if (directoryName !== projectName) {
+      args.push(`-dir=${directoryName}`);
+    }
     args.push('-sg');
   } else {
     args.push('init');
@@ -156,7 +160,7 @@ function runEmberRemotely({
 
   if (isCustomBlueprint) {
     args = ['ember-cli', ...args];
-    // args = ['-p', 'github:ember-cli/ember-cli#cfb9780', 'ember', 'new', projectName, '-sn', '-sg', '-b', `${blueprint.packageName}@${blueprint.version}`];
+    // args = ['-p', 'github:ember-cli/ember-cli#cfb9780', 'ember', 'new', projectName, `-dir=${directoryName}, '-sg', -sn', '-b', `${blueprint.packageName}@${blueprint.version}`];
   } else {
     args = ['-p', `ember-cli@${blueprint.version}`, 'ember', ...args];
   }
@@ -174,7 +178,10 @@ function createProject(runEmber) {
     }
   }) => {
     return async function createProject(cwd) {
-      let projectRoot = path.join(cwd, projectName);
+      // remove scope
+      let directoryName = projectName.replace(/^@.+\//, '');
+
+      let projectRoot = path.join(cwd, directoryName);
 
       async function _runEmber(blueprint) {
         let _cwd = cwd;
@@ -185,6 +192,7 @@ function createProject(runEmber) {
 
         let args = getArgs({
           projectName,
+          directoryName,
           blueprint
         });
 

test/unit/get-start-and-end-commands-test.js

@@ -775,6 +775,7 @@ describe(_getStartAndEndCommands, function() {
     function getArgs(options) {
       return _getArgs({
         projectName,
+        directoryName: projectName,
         ...options
       });
     }
@@ -816,6 +817,26 @@ describe(_getStartAndEndCommands, function() {
       ]);
     });
 
+    it('works for scoped project', function() {
+      let blueprint = loadDefaultBlueprint(['welcome']);
+
+      let args = getArgs({
+        projectName: `@my-scope/${projectName}`,
+        blueprint
+      });
+
+      expect(args).to.deep.equal([
+        'new',
+        `@my-scope/${projectName}`,
+        `-dir=${projectName}`,
+        '-sg',
+        '-sn',
+        '-sb',
+        '-b',
+        'app'
+      ]);
+    });
+
     it('works for custom base blueprint', function() {
       let blueprint = loadSafeBlueprint({
         path: '/path/to/my-blueprint',