reset command

Author: Kelly Selden

bin/commands/default.js

@@ -2,17 +2,23 @@
 
 const args = require('../../src/args');
 const emberCliUpdate = require('../../src');
+const reset = require('../../src/reset');
 
 module.exports.command = '$0';
 
 module.exports.builder = args;
 
 module.exports.handler = async function handler(argv) {
   try {
-    let result = await emberCliUpdate({
-      ...argv,
-      blueprintOptions: argv._.slice(0)
-    });
+    let result;
+    if (argv.reset) {
+      result = await reset(argv);
+    } else {
+      result = await emberCliUpdate({
+        ...argv,
+        blueprintOptions: argv._.slice(0)
+      });
+    }
 
     let ps = result.resolveConflictsProcess;
     if (ps) {

src/command.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const emberCliUpdate = require('.');
+const reset = require('./reset');
 const args = require('./args');
 
 module.exports = {
@@ -82,7 +83,12 @@ module.exports = {
   ],
 
   async run(options) {
-    let result = await emberCliUpdate(options);
+    let result;
+    if (options.reset) {
+      result = await reset(options);
+    } else {
+      result = await emberCliUpdate(options);
+    }
 
     let ps = result.resolveConflictsProcess;
     if (ps) {

src/index.js

@@ -55,7 +55,6 @@ module.exports = async function emberCliUpdate({
   runCodemods,
   codemodsSource,
   codemodsJson,
-  reset,
   compareOnly,
   statsOnly,
   listCodemods,
@@ -104,7 +103,7 @@ module.exports = async function emberCliUpdate({
       blueprint.version = from;
     }
 
-    if (!blueprint.version && !reset) {
+    if (!blueprint.version) {
       throw new Error('A custom blueprint cannot detect --from. You must supply it.');
     }
   } else {
@@ -120,7 +119,6 @@ module.exports = async function emberCliUpdate({
       } = await chooseBlueprintUpdates({
         cwd,
         emberCliUpdateJson,
-        reset,
         to
       });
 
@@ -129,9 +127,7 @@ module.exports = async function emberCliUpdate({
       }
 
       blueprint = _blueprint;
-      if (!reset) {
-        to = _to;
-      }
+      to = _to;
     }
   }
 
@@ -185,10 +181,7 @@ module.exports = async function emberCliUpdate({
         throw 'cannot checkout older versions of glimmer blueprint';
       }
 
-      let startBlueprint;
-      if (!reset) {
-        startBlueprint = { ...blueprint };
-      }
+      let startBlueprint = { ...blueprint };
       endBlueprint = { ...blueprint };
       delete endBlueprint.version;
 
@@ -240,7 +233,6 @@ module.exports = async function emberCliUpdate({
     remoteUrl: ({ projectOptions }) => getRemoteUrl(projectOptions),
     compareOnly,
     resolveConflicts,
-    reset,
     statsOnly,
     listCodemods,
     runCodemods,
@@ -260,12 +252,10 @@ module.exports = async function emberCliUpdate({
           blueprint: endBlueprint
         });
 
-        if (!reset) {
-          await stageBlueprintFile({
-            cwd,
-            emberCliUpdateJsonPath
-          });
-        }
+        await stageBlueprintFile({
+          cwd,
+          emberCliUpdateJsonPath
+        });
       }
 
       return result;

src/reset.js

@@ -4,15 +4,14 @@ const boilerplateUpdate = require('boilerplate-update');
 const getStartAndEndCommands = require('./get-start-and-end-commands');
 const parseBlueprintPackage = require('./parse-blueprint-package');
 const saveBlueprint = require('./save-blueprint');
-const loadDefaultBlueprintFromDisk = require('./load-default-blueprint-from-disk');
-const loadSafeBlueprint = require('./load-safe-blueprint');
 const loadSafeBlueprintFile = require('./load-safe-blueprint-file');
 const { getBlueprintRelativeFilePath } = require('./get-blueprint-file-path');
 const findBlueprint = require('./find-blueprint');
 const getBaseBlueprint = require('./get-base-blueprint');
 const getBlueprintFilePath = require('./get-blueprint-file-path');
 const resolvePackage = require('./resolve-package');
 const { defaultTo } = require('./constants');
+const chooseBlueprintUpdates = require('./choose-blueprint-updates');
 
 module.exports = async function reset({
   blueprint: _blueprint,
@@ -25,67 +24,73 @@ module.exports = async function reset({
   // We must rely on a lookup before the run.
   let emberCliUpdateJsonPath = await getBlueprintFilePath(cwd);
 
-  let packageName;
-  let name;
-  let location;
-  let url;
+  let emberCliUpdateJson = await loadSafeBlueprintFile(emberCliUpdateJsonPath);
+
+  let { blueprints } = emberCliUpdateJson;
+
+  if (!blueprints.length) {
+    throw new Error('No blueprints found.');
+  }
+
+  let blueprint;
+  let packageInfo;
+
   if (_blueprint) {
     let parsedPackage = await parseBlueprintPackage({
       cwd,
       blueprint: _blueprint
     });
-    packageName = parsedPackage.name;
-    name = parsedPackage.name;
-    location = parsedPackage.location;
-    url = parsedPackage.url;
-  } else {
-    let defaultBlueprint = await loadDefaultBlueprintFromDisk(cwd);
-    packageName = defaultBlueprint.packageName;
-    name = defaultBlueprint.name;
-  }
-
-  let packageInfo = await resolvePackage({
-    name: packageName,
-    url,
-    range: to
-  });
+    let url = parsedPackage.url;
 
-  packageName = packageInfo.name;
-  if (!name) {
-    name = packageInfo.name;
-  }
-  let version = packageInfo.version;
-  let path = packageInfo.path;
+    packageInfo = await resolvePackage({
+      name: parsedPackage.name,
+      url,
+      range: to
+    });
 
-  let emberCliUpdateJson = await loadSafeBlueprintFile(emberCliUpdateJsonPath);
+    let packageName = packageInfo.name;
+    let name = packageInfo.name;
 
-  let blueprint;
+    let existingBlueprint = findBlueprint(emberCliUpdateJson, packageName, name);
+    if (!existingBlueprint) {
+      throw new Error('Blueprint not found.');
+    }
 
-  let existingBlueprint = findBlueprint(emberCliUpdateJson, packageName, name);
-  if (existingBlueprint) {
     blueprint = existingBlueprint;
   } else {
-    blueprint = {
-      packageName,
-      name,
-      location
-    };
-  }
+    let {
+      blueprint: _blueprint
+    } = await chooseBlueprintUpdates({
+      cwd,
+      emberCliUpdateJson,
+      reset: true
+    });
+
+    blueprint = _blueprint;
 
-  blueprint = loadSafeBlueprint(blueprint);
+    let parsedPackage = await parseBlueprintPackage({
+      cwd,
+      blueprint: blueprint.location || blueprint.packageName
+    });
+    let url = parsedPackage.url;
 
-  blueprint.version = version;
-  blueprint.path = path;
+    packageInfo = await resolvePackage({
+      name: blueprint.packageName,
+      url,
+      range: to
+    });
+  }
 
-  let baseBlueprint = await getBaseBlueprint({
-    cwd,
-    blueprints: emberCliUpdateJson.blueprints,
-    blueprint
-  });
+  blueprint.version = packageInfo.version;
+  blueprint.path = packageInfo.path;
 
-  if (!baseBlueprint) {
-    // for non-existing default blueprints
-    blueprint.isBaseBlueprint = true;
+  let baseBlueprint;
+  if (!blueprint.isBaseBlueprint) {
+    baseBlueprint = await getBaseBlueprint({
+      cwd,
+      blueprints,
+      blueprint
+    });
   }
 
   let {

test/acceptance/ember-cli-update-test.js

@@ -94,7 +94,10 @@ describe(function() {
       ];
     }
     if (reset) {
-      args.push('--reset');
+      args = [
+        'reset',
+        ...to ? [`--to=${to}`] : []
+      ];
     }
     if (blueprint) {
       args.push(`-b=${blueprint}`);
@@ -350,15 +353,18 @@ describe(function() {
 
   it('can reset from multiple blueprint', async function() {
     let {
-      location,
+      location
+    } = (await loadSafeBlueprintFile('test/fixtures/blueprint/app/local-app/reset/local/my-app/config/ember-cli-update.json')).blueprints[1];
+
+    let {
       version: to
-    } = (await loadSafeBlueprintFile('test/fixtures/blueprint/app/local-app/local/my-app/config/ember-cli-update.json')).blueprints[1];
+    } = (await loadSafeBlueprintFile('test/fixtures/blueprint/app/local-app/reset/merge/my-app/config/ember-cli-update.json')).blueprints[1];
 
     let {
       ps,
       promise
     } = await merge({
-      fixturesPath: 'test/fixtures/blueprint/app/local-app/local',
+      fixturesPath: 'test/fixtures/blueprint/app/local-app/reset/local',
       commitMessage: 'my-app',
       reset: true,
       to,
@@ -396,15 +402,42 @@ describe(function() {
   });
 
   it('can reset the default blueprint', async function() {
+    let commitMessage = 'my-app';
+
     let {
-      status
-    } = await (await merge({
+      ps,
+      promise
+    } = await merge({
       fixturesPath: 'test/fixtures/app/local',
-      commitMessage: 'my-app',
-      init: true,
+      commitMessage,
       reset: true,
-      to: '2.11.1'
-    })).promise;
+      to: '2.11.1',
+      async beforeMerge() {
+        await fs.copy(
+          path.resolve(__dirname, '../fixtures/ember-cli-update-json/default/config/ember-cli-update.json'),
+          path.join(tmpPath, 'config/ember-cli-update.json')
+        );
+
+        await commit({ m: commitMessage, cwd: tmpPath });
+      }
+    });
+
+    let whichBlueprint = new Promise(resolve => {
+      function whichBlueprint(data) {
+        let str = data.toString();
+        if (str.includes('Which blueprint would you like to reset?')) {
+          ps.stdin.write(`${down}${enter}`);
+          ps.stdout.removeListener('data', whichBlueprint);
+          resolve();
+        }
+      }
+      ps.stdout.on('data', whichBlueprint);
+    });
+    await whichBlueprint;
+
+    let {
+      status
+    } = await promise;
 
     fixtureCompare({
       mergeFixtures: 'test/fixtures/app/reset/my-app'