add blueprint initialization and addon installation

Author: Kelly Selden

bin/commands/init.js

@@ -0,0 +1,37 @@
+'use strict';
+
+const args = require('../../src/args');
+const init = require('../../src/init');
+
+module.exports.command = 'init';
+
+module.exports.describe = 'initialize a blueprint';
+
+module.exports.builder = {
+  blueprint: args['blueprint'],
+  to: args['to'],
+  resolveConflicts: args['resolve-conflicts'],
+  reset: args['reset']
+};
+
+module.exports.handler = async function handler(argv) {
+  let blueprint = argv['blueprint'];
+  let to = argv['to'];
+  let resolveConflicts = argv['resolve-conflicts'];
+  let reset = argv['reset'];
+
+  try {
+    let message = await init({
+      blueprint,
+      to,
+      resolveConflicts,
+      reset,
+      wasRunAsExecutable: true
+    });
+    if (message) {
+      console.log(message);
+    }
+  } catch (err) {
+    console.error(err);
+  }
+};

bin/commands/install.js

@@ -0,0 +1,22 @@
+'use strict';
+
+const install = require('../../src/install');
+
+module.exports.command = 'install <addon>';
+
+module.exports.describe = 'install an addon';
+
+module.exports.handler = async function handler(argv) {
+  let addon = argv['addon'];
+
+  try {
+    let message = await install({
+      addon
+    });
+    if (message) {
+      console.log(message);
+    }
+  } catch (err) {
+    console.error(err);
+  }
+};

src/get-project-options.js

@@ -30,7 +30,7 @@ module.exports = async function getProjectOptions({
   dependencies,
   devDependencies
 }, blueprint) {
-  if (blueprint.name !== 'ember-cli') {
+  if (blueprint && blueprint.name !== 'ember-cli') {
     return ['blueprint'];
   }
 

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

@@ -2,6 +2,7 @@
 
 const path = require('path');
 const fs = require('fs-extra');
+const run = require('./run');
 const utils = require('./utils');
 
 const nodeModulesIgnore = `
@@ -23,7 +24,7 @@ module.exports = function getStartAndEndCommands({
     options += ' --yarn';
   }
 
-  if (!projectOptions.includes('welcome') && !projectOptions.includes('blueprint')) {
+  if (!projectOptions.includes('welcome') && startBlueprint && startBlueprint.name === 'ember-cli') {
     options += ' --no-welcome';
   }
 
@@ -40,14 +41,14 @@ module.exports = function getStartAndEndCommands({
   return {
     projectName,
     projectOptions,
-    ...projectOptions.includes('blueprint') ? {} : {
+    ...endBlueprint.name === 'ember-cli' ? {
       packageName: 'ember-cli',
       commandName: 'ember',
       // `createProjectFromCache` no longer works with custom blueprints.
       // It would look for an `ember-cli` version with the same version
       // as the blueprint.
       createProjectFromCache: createProjectFromCache(command)
-    },
+    } : {},
     createProjectFromRemote: createProjectFromRemote(command),
     startOptions: {
       packageVersion: startVersion,
@@ -86,16 +87,36 @@ function createProjectFromRemote(command) {
     options
   }) {
     return async function createProject(cwd) {
-      if (options.blueprint.name !== 'ember-cli') {
-        await utils.npx(`ember-cli ${command} -b ${options.blueprint.path}`, { cwd });
-        // await utils.npx(`-p github:ember-cli/ember-cli#cfb9780 ember ${command} -b ${options.blueprint.name}@${options.packageVersion}`, { cwd });
-
-        await module.exports.appendNodeModulesIgnore({
+      if (options.blueprint) {
+        if (options.blueprint.name !== 'ember-cli') {
+          await utils.npx(`ember-cli ${command} -b ${options.blueprint.path}`, { cwd });
+          // await utils.npx(`-p github:ember-cli/ember-cli#cfb9780 ember ${command} -b ${options.blueprint.name}@${options.packageVersion}`, { cwd });
+
+          // This means it's not a full app blueprint, but a default blueprint of an addon.
+          // There may be a faster way to detect this.
+          let files = await utils.readdir(path.join(cwd, options.projectName));
+          if (!files.length) {
+            await module.exports.installAddonBlueprint({
+              cwd,
+              projectName: options.projectName,
+              command,
+              blueprintPath: options.blueprint.path
+            });
+          }
+
+          await module.exports.appendNodeModulesIgnore({
+            cwd,
+            projectName: options.projectName
+          });
+        } else {
+          await utils.npx(`-p ember-cli@${options.packageVersion} ember ${command}`, { cwd });
+        }
+      } else {
+        // We are doing a blueprint init, and need an empty first commit.
+        await module.exports.createEmptyCommit({
           cwd,
           projectName: options.projectName
         });
-      } else {
-        await utils.npx(`-p ember-cli@${options.packageVersion} ember ${command}`, { cwd });
       }
 
       return postCreateProject({
@@ -115,6 +136,35 @@ function postCreateProject({
   return path.join(cwd, projectName);
 }
 
+module.exports.installAddonBlueprint = async function installAddonBlueprint({
+  cwd,
+  projectName,
+  command,
+  blueprintPath
+}) {
+  await fs.remove(path.join(cwd, projectName));
+
+  await utils.npx(`ember-cli ${command}`, { cwd });
+
+  await run('npm install', { cwd: path.join(cwd, projectName) });
+
+  await utils.npx(`--no-install ember install ${blueprintPath}`, { cwd: path.join(cwd, projectName) });
+
+  await fs.remove(path.join(cwd, projectName, 'package-lock.json'));
+};
+
+module.exports.createEmptyCommit = async function createEmptyCommit({
+  cwd,
+  projectName
+}) {
+  await fs.mkdir(path.join(cwd, projectName));
+  await fs.writeFile(path.join(cwd, projectName, 'package.json'), '{}');
+  await appendNodeModulesIgnore({
+    cwd,
+    projectName
+  });
+};
+
 async function appendNodeModulesIgnore({
   cwd,
   projectName

src/index.js

@@ -13,8 +13,10 @@ const boilerplateUpdate = require('boilerplate-update');
 const getStartAndEndCommands = require('./get-start-and-end-commands');
 const parseBlueprint = require('./parse-blueprint');
 const downloadBlueprint = require('./download-blueprint');
+const loadBlueprintFile = require('./load-blueprint-file');
 const loadSafeBlueprintFile = require('./load-safe-blueprint-file');
 const saveBlueprint = require('./save-blueprint');
+const saveDefaultBlueprint = require('./save-default-blueprint');
 
 module.exports = async function emberCliUpdate({
   blueprint: _blueprint,
@@ -35,20 +37,31 @@ module.exports = async function emberCliUpdate({
 
   let cwd = process.cwd();
 
+  let emberCliUpdateJson = await loadSafeBlueprintFile(cwd);
+
   let blueprint;
 
   if (_blueprint) {
-    if (!from) {
-      throw new Error('A custom blueprint cannot detect --from. You must supply it.');
+    blueprint = await parseBlueprint(_blueprint);
+
+    if (from) {
+      blueprint.version = from;
+    } else {
+      let { blueprints } = emberCliUpdateJson;
+      let existingBlueprint = blueprints.find(b => b.name === _blueprint);
+      if (existingBlueprint) {
+        blueprint.location = existingBlueprint.location;
+        blueprint.version = existingBlueprint.version;
+      }
     }
 
-    blueprint = await parseBlueprint(_blueprint);
-    blueprint.version = from;
+    if (!blueprint.version) {
+      throw new Error('A custom blueprint cannot detect --from. You must supply it.');
+    }
   } else {
-    let { blueprints } = await loadSafeBlueprintFile(cwd);
+    let { blueprints } = emberCliUpdateJson;
 
-    let completeBlueprints = blueprints.filter(blueprint => !blueprint.isPartial);
-    if (!completeBlueprints.length) {
+    if (!blueprints.length) {
       blueprints.splice(0, 0, defaultBlueprint);
     }
 
@@ -64,10 +77,10 @@ module.exports = async function emberCliUpdate({
     } else {
       blueprint = blueprints[0];
     }
+  }
 
-    if (blueprint.location) {
-      blueprint.url = (await parseBlueprint(blueprint.location)).url;
-    }
+  if (blueprint && !blueprint.url && blueprint.location) {
+    blueprint.url = (await parseBlueprint(blueprint.location)).url;
   }
 
   let isCustomBlueprint = blueprint.name !== defaultBlueprint.name;
@@ -146,18 +159,38 @@ module.exports = async function emberCliUpdate({
     wasRunAsExecutable
   })).promise;
 
-  let { blueprints } = await loadSafeBlueprintFile(cwd);
+  if (_blueprint) {
+    let emberCliUpdateJson = await loadBlueprintFile(cwd);
 
-  let existingBlueprint = blueprints.find(b => b.name === blueprint.name);
+    if (!emberCliUpdateJson && blueprint.name !== defaultBlueprint.name) {
+      await saveDefaultBlueprint({
+        cwd,
+        defaultBlueprint
+      });
+    }
 
-  if (existingBlueprint) {
     await saveBlueprint({
       cwd,
       name: blueprint.name,
+      location: blueprint.location,
       version: endVersion
     });
 
     await run('git add ember-cli-update.json');
+  } else {
+    let { blueprints } = await loadSafeBlueprintFile(cwd);
+
+    let existingBlueprint = blueprints.find(b => b.name === blueprint.name);
+
+    if (existingBlueprint) {
+      await saveBlueprint({
+        cwd,
+        name: blueprint.name,
+        version: endVersion
+      });
+
+      await run('git add ember-cli-update.json');
+    }
   }
 
   return result;

src/init.js

@@ -0,0 +1,65 @@
+'use strict';
+
+const run = require('./run');
+const getRemoteUrl = require('./get-remote-url');
+const boilerplateUpdate = require('boilerplate-update');
+const getStartAndEndCommands = require('./get-start-and-end-commands');
+const parseBlueprint = require('./parse-blueprint');
+const downloadBlueprint = require('./download-blueprint');
+const saveBlueprint = require('./save-blueprint');
+
+module.exports = async function init({
+  blueprint,
+  to,
+  resolveConflicts,
+  reset,
+  wasRunAsExecutable
+}) {
+  let defaultBlueprint = {
+    name: 'ember-cli'
+  };
+
+  let cwd = process.cwd();
+
+  let parsedBlueprint;
+  if (blueprint) {
+    parsedBlueprint = await parseBlueprint(blueprint);
+  } else {
+    parsedBlueprint = defaultBlueprint;
+  }
+  parseBlueprint.version = to;
+
+  let downloadedBlueprint = await downloadBlueprint(parsedBlueprint.name, parsedBlueprint.url, parseBlueprint.version);
+
+  let result = await (await boilerplateUpdate({
+    projectOptions: ['blueprint'],
+    remoteUrl: ({ projectOptions }) => getRemoteUrl(projectOptions),
+    endVersion: downloadedBlueprint.version,
+    resolveConflicts,
+    reset,
+    createCustomDiff: true,
+    customDiffOptions: ({
+      packageJson,
+      projectOptions,
+      endVersion
+    }) => getStartAndEndCommands({
+      packageJson,
+      projectOptions,
+      endVersion,
+      endBlueprint: downloadedBlueprint
+    }),
+    ignoredFiles: ['ember-cli-update.json'],
+    wasRunAsExecutable
+  })).promise;
+
+  await saveBlueprint({
+    cwd,
+    name: downloadedBlueprint.name,
+    location: parsedBlueprint.location,
+    version: downloadedBlueprint.version
+  });
+
+  await run('git add ember-cli-update.json');
+
+  return result;
+};

src/install.js

@@ -0,0 +1,42 @@
+'use strict';
+
+const utils = require('./utils');
+const parseBlueprint = require('./parse-blueprint');
+const downloadBlueprint = require('./download-blueprint');
+const saveBlueprint = require('./save-blueprint');
+const loadBlueprintFile = require('./load-blueprint-file');
+const saveDefaultBlueprint = require('./save-default-blueprint');
+
+const toDefault = require('./args').to.default;
+
+module.exports = async function install({
+  addon
+}) {
+  let defaultBlueprint = {
+    name: 'ember-cli'
+  };
+
+  let cwd = process.cwd();
+
+  await utils.npx(`--no-install ember install ${addon}`);
+
+  let parsedBlueprint = await parseBlueprint(addon);
+  let downloadedBlueprint = await downloadBlueprint(parsedBlueprint.name, parsedBlueprint.url, toDefault);
+
+  let emberCliUpdateJson = await loadBlueprintFile(cwd);
+
+  if (!emberCliUpdateJson && downloadedBlueprint.name !== defaultBlueprint.name) {
+    await saveDefaultBlueprint({
+      cwd,
+      defaultBlueprint
+    });
+  }
+
+  await saveBlueprint({
+    cwd,
+    name: downloadedBlueprint.name,
+    location: parsedBlueprint.location,
+    version: downloadedBlueprint.version
+    // isPartial: true
+  });
+};