resets blueprint when config file

Author: Kelly Selden

src/choose-blueprint-updates.js

@@ -15,71 +15,103 @@ function formatBlueprintLine({
   return `${name}, current: ${currentVersion}, latest: ${latestVersion}`;
 }
 
+async function chooseBlueprint({
+  choicesByName,
+  message
+}) {
+  let answer = await inquirer.prompt([{
+    type: 'list',
+    message,
+    name: 'blueprint',
+    choices: Object.values(choicesByName).map(({ choice }) => choice)
+  }]);
+
+  return choicesByName[answer.blueprint];
+}
+
 async function chooseBlueprintUpdates({
   cwd,
-  emberCliUpdateJson
+  emberCliUpdateJson,
+  reset
 }) {
   let to;
-  let blueprint;
+  let existingBlueprint;
+  let blueprintUpdates;
+  let areAllUpToDate;
 
   let { blueprints } = emberCliUpdateJson;
 
-  let blueprintUpdates = await checkForBlueprintUpdates({
-    cwd,
-    blueprints
-  });
-
-  let areAllUpToDate = blueprintUpdates.every(blueprintUpdate => blueprintUpdate.isUpToDate);
-  if (!areAllUpToDate) {
-    let choicesByName = blueprintUpdates.reduce((choices, blueprintUpdate) => {
-      let name = formatBlueprintLine(blueprintUpdate);
+  if (reset) {
+    let choicesByName = blueprints.reduce((choices, blueprint) => {
+      let name = blueprint.packageName;
       choices[name] = {
-        blueprintUpdate,
+        blueprint,
         choice: {
-          name,
-          disabled: blueprintUpdate.isUpToDate
+          name
         }
       };
       return choices;
     }, {});
 
-    let answer = await inquirer.prompt([{
-      type: 'list',
-      message: 'Blueprint updates have been found. Which one would you like to update?',
-      name: 'blueprint',
-      choices: Object.values(choicesByName).map(({ choice }) => choice)
-    }]);
-
-    let { blueprintUpdate } = choicesByName[answer.blueprint];
-
-    let existingBlueprint = findBlueprint(emberCliUpdateJson, blueprintUpdate.packageName, blueprintUpdate.name);
-    blueprint = loadSafeBlueprint(existingBlueprint);
-
-    let latestVersion = `${blueprintUpdate.latestVersion} (latest)`;
-
-    answer = await inquirer.prompt([{
-      type: 'list',
-      message: 'Do you want the latest version?',
-      name: 'choice',
-      choices: [
-        latestVersion,
-        'SemVer string'
-      ]
-    }]);
-
-    if (answer.choice === latestVersion) {
-      to = toDefault;
-    } else {
-      answer = await inquirer.prompt([{
-        type: 'input',
-        message: 'What version?',
-        name: 'semver'
+    existingBlueprint = (await chooseBlueprint({
+      choicesByName,
+      message: 'Which blueprint would you like to reset?'
+    })).blueprint;
+  } else {
+    blueprintUpdates = await checkForBlueprintUpdates({
+      cwd,
+      blueprints
+    });
+
+    areAllUpToDate = blueprintUpdates.every(blueprintUpdate => blueprintUpdate.isUpToDate);
+    if (!areAllUpToDate) {
+      let choicesByName = blueprintUpdates.reduce((choices, blueprintUpdate) => {
+        let name = formatBlueprintLine(blueprintUpdate);
+        choices[name] = {
+          blueprintUpdate,
+          choice: {
+            name,
+            disabled: blueprintUpdate.isUpToDate
+          }
+        };
+        return choices;
+      }, {});
+
+      let { blueprintUpdate } = await chooseBlueprint({
+        choicesByName,
+        message: 'Blueprint updates have been found. Which one would you like to update?'
+      });
+
+      existingBlueprint = findBlueprint(emberCliUpdateJson, blueprintUpdate.packageName, blueprintUpdate.name);
+
+      let latestVersion = `${blueprintUpdate.latestVersion} (latest)`;
+
+      let answer = await inquirer.prompt([{
+        type: 'list',
+        message: 'Do you want the latest version?',
+        name: 'choice',
+        choices: [
+          latestVersion,
+          'SemVer string'
+        ]
       }]);
 
-      to = answer.semver;
+      if (answer.choice === latestVersion) {
+        to = toDefault;
+      } else {
+        answer = await inquirer.prompt([{
+          type: 'input',
+          message: 'What version?',
+          name: 'semver'
+        }]);
+
+        to = answer.semver;
+      }
     }
   }
 
+  let blueprint = loadSafeBlueprint(existingBlueprint);
+
   return {
     blueprintUpdates,
     areAllUpToDate,

src/index.js

@@ -108,7 +108,8 @@ module.exports = async function emberCliUpdate({
         to: _to
       } = await chooseBlueprintUpdates({
         cwd,
-        emberCliUpdateJson
+        emberCliUpdateJson,
+        reset
       });
 
       if (areAllUpToDate) {
@@ -119,7 +120,9 @@ All blueprints are up-to-date!`;
       }
 
       blueprint = _blueprint;
-      to = _to;
+      if (!reset) {
+        to = _to;
+      }
     }
   }
 

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

@@ -311,6 +311,55 @@ describe(function() {
     assertNoUnstaged(status);
   });
 
+  it('can reset from multiple blueprint', async function() {
+    let {
+      location,
+      version: to
+    } = (await loadSafeBlueprintFile('test/fixtures/blueprint/app/local-app/reset/my-app/config/ember-cli-update.json')).blueprints[1];
+
+    let {
+      ps,
+      promise
+    } = await merge({
+      fixturesPath: 'test/fixtures/blueprint/app/local-app/local',
+      commitMessage: 'my-app',
+      reset: true,
+      to,
+      async beforeMerge() {
+        await initBlueprint({
+          fixturesPath: 'test/fixtures/blueprint/app/local',
+          resolvedFrom: tmpPath,
+          relativeDir: location
+        });
+      }
+    });
+
+    let whichBlueprint = new Promise(resolve => {
+      function whichBlueprint(data) {
+        let str = data.toString();
+        if (str.includes('Which blueprint would you like to reset?')) {
+          let down = '\u001b[B';
+          let enter = '\n';
+          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/blueprint/app/local-app/reset/my-app'
+    });
+
+    assertNoStaged(status);
+  });
+
   it('can init the default blueprint', async function() {
     this.timeout(5 * 60 * 1000);
 

test/fixtures/blueprint/app/legacy-app/reset/my-app/blueprint.txt

@@ -0,0 +1 @@
+123123

test/fixtures/blueprint/app/legacy-app/reset/my-app/config2/ember-cli-update.json

@@ -0,0 +1,19 @@
+{
+  "schemaVersion": 0,
+  "packages": [
+    {
+      "name": "ember-cli-update-git-blueprint-test",
+      "location": "../legacy-blueprint",
+      "version": "0.0.1",
+      "blueprints": [
+        {
+          "name": "ember-cli-update-git-blueprint-test",
+          "isBaseBlueprint": true,
+          "options": [
+            "--custom-option=123"
+          ]
+        }
+      ]
+    }
+  ]
+}

test/fixtures/blueprint/app/legacy-app/reset/my-app/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "my-app",
+  "version": "0.0.0"
+}

test/fixtures/blueprint/app/local-app/reset/my-app/config/ember-cli-update.json

@@ -0,0 +1,28 @@
+{
+  "schemaVersion": 0,
+  "packages": [
+    {
+      "name": "ember-cli-update-npm-blueprint-test",
+      "version": "0.0.24",
+      "blueprints": [
+        {
+          "name": "ember-cli-update-npm-blueprint-test",
+          "isBaseBlueprint": true
+        }
+      ]
+    },
+    {
+      "name": "ember-cli-update-git-blueprint-test",
+      "location": "../local-blueprint",
+      "version": "0.0.1",
+      "blueprints": [
+        {
+          "name": "ember-cli-update-git-blueprint-test",
+          "options": [
+            "--supplied-option=foo"
+          ]
+        }
+      ]
+    }
+  ]
+}

test/fixtures/blueprint/app/local-app/reset/my-app/test-blueprint-file.txt

@@ -0,0 +1,4 @@
+my-app
+ember-cli-update-git-blueprint-test
+0.0.1
+foo

test/fixtures/blueprint/app/local-app/reset/my-app/test-file.txt

@@ -0,0 +1 @@
+0.0.24

test/integration/index-test.js

@@ -200,15 +200,6 @@ describe(function() {
       commitMessage: 'my-app',
       reset: true,
       to: '2.11.1'
-      // test the resetting logic of ember-cli-update.json
-      // no longer a valid blueprint name
-      // blueprint: 'ember-cli',
-      // async afterMerge() {
-      //   expect(path.join(tmpPath, 'config/ember-cli-update.json')).to.be.a.file()
-      //     .and.equal(path.join(cwd, 'test/fixtures/ember-cli-update-json/default/config/ember-cli-update.json'));
-
-      //   await fs.remove(path.join(tmpPath, 'config/ember-cli-update.json'));
-      // }
     });
 
     fixtureCompare({
@@ -400,6 +391,36 @@ applicable codemods: ember-modules-codemod, ember-qunit-codemod, ember-test-help
 
         assertNoUnstaged(status);
       });
+
+      it('resets blueprint', async function() {
+        let {
+          location,
+          version: to
+        } = (await loadSafeBlueprintFile('test/fixtures/blueprint/app/legacy-app/local/my-app/config2/ember-cli-update.json')).blueprints[0];
+
+        let {
+          status
+        } = await merge({
+          fixturesPath: 'test/fixtures/blueprint/app/legacy-app/merge',
+          commitMessage: 'my-app',
+          reset: true,
+          to,
+          blueprint: 'ember-cli-update-git-blueprint-test',
+          async beforeMerge() {
+            await initBlueprint({
+              fixturesPath: 'test/fixtures/blueprint/app/legacy',
+              resolvedFrom: tmpPath,
+              relativeDir: location
+            });
+          }
+        });
+
+        fixtureCompare({
+          mergeFixtures: 'test/fixtures/blueprint/app/legacy-app/reset/my-app'
+        });
+
+        assertNoStaged(status);
+      });
     });
 
     describe('ember-cli-update.json', function() {