save state file by default

Kelly Selden · Kelly Selden · commit df373084c8e1 · 2020-02-09T17:52:09.000Z
diff --git a/README.md b/README.md
@@ -74,7 +74,7 @@ ember-cli-update --run-codemods
 |---|---|---|---|---|
 | --blueprint | Provide a custom blueprint for use in the update | String | "@glimmer/blueprint" "git+https://git@github.com/tildeio/libkit.git" "../blueprint" | |
 | --from | Use a starting version that is different than what is in your package.json | String | "2.9.1" | |
-| --to | Update to a version that isn\'t latest | String | "2.14.1" "~2.15" "latest" "beta" | "*" |
+| --to | Update to a version that isn\'t latest | String | "2.14.1" "~2.15" "latest" "beta" | |
 | --resolve-conflicts | Automatically run git mergetool if conflicts found | Boolean | | false |
 | --run-codemods | Run codemods to help update your code | Boolean | | false |
 | --codemods-source | Supply your own codemods manifest via URL | String | "ember-app-codemods-manifest@*" "git+https://github.com/ember-cli/ember-app-codemods-manifest.git#semver:*" | |
diff --git a/src/args.js b/src/args.js
@@ -1,7 +1,5 @@
 'use strict';
 
-const { defaultTo } = require('./constants');
-
 module.exports = {
   'blueprint': {
     alias: ['b'],
@@ -14,7 +12,6 @@ module.exports = {
   },
   'to': {
     type: 'string',
-    default: defaultTo,
     description: 'Update to a version that isn\'t latest ("2.14.1", "~2.15", "latest", "beta")'
   },
   'resolve-conflicts': {
diff --git a/src/choose-blueprint-updates.js b/src/choose-blueprint-updates.js
@@ -29,9 +29,9 @@ async function chooseBlueprint({
 async function chooseBlueprintUpdates({
   cwd,
   emberCliUpdateJson,
-  reset
+  reset,
+  to
 }) {
-  let to;
   let existingBlueprint;
   let areAllUpToDate;
 
@@ -87,28 +87,30 @@ All blueprints are up-to-date!`);
 
       existingBlueprint = blueprintUpdate.blueprint;
 
-      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'
-        ]
-      }]);
-
-      if (answer.choice === latestVersion) {
-        to = defaultTo;
-      } else {
-        answer = await inquirer.prompt([{
-          type: 'input',
-          message: 'What version?',
-          name: 'semver'
+      if (typeof to !== 'string') {
+        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 = defaultTo;
+        } else {
+          answer = await inquirer.prompt([{
+            type: 'input',
+            message: 'What version?',
+            name: 'semver'
+          }]);
+
+          to = answer.semver;
+        }
       }
     }
   }
diff --git a/src/index.js b/src/index.js
@@ -50,7 +50,7 @@ module.exports = async function emberCliUpdate({
   blueprint: _blueprint,
   blueprintOptions,
   from,
-  to = defaultTo,
+  to,
   resolveConflicts,
   runCodemods,
   codemodsSource,
@@ -72,7 +72,6 @@ module.exports = async function emberCliUpdate({
 
   let blueprint;
   let packageUrl;
-  let isPersistedBlueprint;
 
   if (_blueprint) {
     let parsedPackage = await parseBlueprintPackage({
@@ -89,7 +88,6 @@ module.exports = async function emberCliUpdate({
 
     let existingBlueprint = findBlueprint(emberCliUpdateJson, packageName, packageName);
     if (existingBlueprint) {
-      isPersistedBlueprint = true;
       blueprint = existingBlueprint;
     } else {
       blueprint = {
@@ -115,16 +113,15 @@ module.exports = async function emberCliUpdate({
     if (!blueprints.length) {
       blueprint = loadDefaultBlueprint();
     } else {
-      isPersistedBlueprint = true;
-
       let {
         areAllUpToDate,
         blueprint: _blueprint,
         to: _to
       } = await chooseBlueprintUpdates({
         cwd,
         emberCliUpdateJson,
-        reset
+        reset,
+        to
       });
 
       if (areAllUpToDate) {
@@ -167,6 +164,10 @@ module.exports = async function emberCliUpdate({
     blueprint.isBaseBlueprint = true;
   }
 
+  if (typeof to !== 'string') {
+    to = defaultTo;
+  }
+
   let endBlueprint;
 
   let {
@@ -259,7 +260,7 @@ module.exports = async function emberCliUpdate({
     promise: (async() => {
       let result = await promise;
 
-      if (_blueprint || isPersistedBlueprint) {
+      if (!(compareOnly || statsOnly || listCodemods || runCodemods)) {
         await saveBlueprint({
           emberCliUpdateJsonPath,
           blueprint: endBlueprint
diff --git a/test/acceptance/ember-addon-test.js b/test/acceptance/ember-addon-test.js
@@ -15,6 +15,9 @@ const {
   assertNoUnstaged
 } = require('../helpers/assertions');
 const mutatePackageJson = require('boilerplate-update/src/mutate-package-json');
+const getBlueprintFilePath = require('../../src/get-blueprint-file-path');
+const loadSafeBlueprintFile = require('../../src/load-safe-blueprint-file');
+const saveBlueprintFile = require('../../src/save-blueprint-file');
 
 describe(function() {
   this.timeout(30 * 1000);
@@ -98,6 +101,15 @@ describe(function() {
       pkg.devDependencies = require('../fixtures/app/merge/my-app/package').devDependencies;
     });
 
+    let emberCliUpdateJsonPath = await getBlueprintFilePath(tmpPath);
+
+    let emberCliUpdateJson = await loadSafeBlueprintFile(emberCliUpdateJsonPath);
+
+    // remove --no-welcome
+    delete emberCliUpdateJson.blueprints[0].options;
+
+    await saveBlueprintFile(emberCliUpdateJsonPath, emberCliUpdateJson);
+
     fixtureCompare({
       mergeFixtures: 'test/fixtures/app/merge/my-app'
     });
diff --git a/test/acceptance/ember-cli-update-test.js b/test/acceptance/ember-cli-update-test.js
@@ -58,7 +58,7 @@ describe(function() {
     await beforeMerge();
 
     let args = [
-      `--to=${to}`,
+      ...to ? [`--to=${to}`] : [],
       '--resolve-conflicts'
     ];
     if (runCodemods) {
@@ -69,7 +69,7 @@ describe(function() {
     if (init) {
       args = [
         'init',
-        `--to=${to}`
+        ...to ? [`--to=${to}`] : []
       ];
     }
     if (install) {
@@ -287,7 +287,7 @@ describe(function() {
     } = await merge({
       fixturesPath: 'test/fixtures/blueprint/app/local-app/local',
       commitMessage: 'my-app',
-      to,
+      to: null,
       async beforeMerge() {
         await initBlueprint({
           fixturesPath: 'test/fixtures/blueprint/app/local',
@@ -406,11 +406,6 @@ describe(function() {
       to: '2.11.1'
     })).promise;
 
-    expect(path.join(tmpPath, 'config/ember-cli-update.json')).to.be.a.file()
-      .and.equal('test/fixtures/ember-cli-update-json/default/config/ember-cli-update.json');
-
-    await fs.remove(path.join(tmpPath, 'config/ember-cli-update.json'));
-
     fixtureCompare({
       mergeFixtures: 'test/fixtures/app/reset/my-app'
     });
@@ -430,11 +425,6 @@ describe(function() {
       to: '2.11.1'
     })).promise;
 
-    expect(path.join(tmpPath, 'config/ember-cli-update.json')).to.be.a.file()
-      .and.equal('test/fixtures/ember-cli-update-json/default/config/ember-cli-update.json');
-
-    await fs.remove(path.join(tmpPath, 'config/ember-cli-update.json'));
-
     fixtureCompare({
       mergeFixtures: 'test/fixtures/app/init/my-app'
     });
diff --git a/test/fixtures/addon/merge/my-addon/tests/dummy/config/ember-cli-update.json b/test/fixtures/addon/merge/my-addon/tests/dummy/config/ember-cli-update.json
@@ -0,0 +1,19 @@
+{
+  "schemaVersion": 0,
+  "packages": [
+    {
+      "name": "ember-cli",
+      "version": "3.11.0-beta.1",
+      "blueprints": [
+        {
+          "name": "addon",
+          "codemodsSource": "ember-addon-codemods-manifest@1",
+          "isBaseBlueprint": true,
+          "options": [
+            "--no-welcome"
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/fixtures/app/init/my-app/config/ember-cli-update.json b/test/fixtures/app/init/my-app/config/ember-cli-update.json
@@ -0,0 +1,16 @@
+{
+  "schemaVersion": 0,
+  "packages": [
+    {
+      "name": "ember-cli",
+      "version": "2.11.1",
+      "blueprints": [
+        {
+          "name": "app",
+          "codemodsSource": "ember-app-codemods-manifest@1",
+          "isBaseBlueprint": true
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/fixtures/app/merge/my-app/config/ember-cli-update.json b/test/fixtures/app/merge/my-app/config/ember-cli-update.json
@@ -0,0 +1,16 @@
+{
+  "schemaVersion": 0,
+  "packages": [
+    {
+      "name": "ember-cli",
+      "version": "3.11.0-beta.1",
+      "blueprints": [
+        {
+          "name": "app",
+          "codemodsSource": "ember-app-codemods-manifest@1",
+          "isBaseBlueprint": true
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/fixtures/app/reset/my-app/config/ember-cli-update.json b/test/fixtures/app/reset/my-app/config/ember-cli-update.json
@@ -0,0 +1,16 @@
+{
+  "schemaVersion": 0,
+  "packages": [
+    {
+      "name": "ember-cli",
+      "version": "2.11.1",
+      "blueprints": [
+        {
+          "name": "app",
+          "codemodsSource": "ember-app-codemods-manifest@1",
+          "isBaseBlueprint": true
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/fixtures/custom/addon/merge/my-custom-addon/tests/dummy/config/ember-cli-update.json b/test/fixtures/custom/addon/merge/my-custom-addon/tests/dummy/config/ember-cli-update.json
@@ -0,0 +1,19 @@
+{
+  "schemaVersion": 0,
+  "packages": [
+    {
+      "name": "ember-cli",
+      "version": "3.11.0-beta.1",
+      "blueprints": [
+        {
+          "name": "addon",
+          "codemodsSource": "ember-addon-codemods-manifest@1",
+          "isBaseBlueprint": true,
+          "options": [
+            "--no-welcome"
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/fixtures/custom/app/merge/my-custom-app/config/ember-cli-update.json b/test/fixtures/custom/app/merge/my-custom-app/config/ember-cli-update.json
@@ -0,0 +1,16 @@
+{
+  "schemaVersion": 0,
+  "packages": [
+    {
+      "name": "ember-cli",
+      "version": "3.11.0-beta.1",
+      "blueprints": [
+        {
+          "name": "app",
+          "codemodsSource": "ember-app-codemods-manifest@1",
+          "isBaseBlueprint": true
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/integration/index-test.js b/test/integration/index-test.js
@@ -1,13 +1,15 @@
 'use strict';
 
+const fs = require('fs-extra');
 const path = require('path');
 const { describe, it } = require('../helpers/mocha');
 const { expect } = require('../helpers/chai');
 const sinon = require('sinon');
 const {
   buildTmp,
   processExit,
-  fixtureCompare: _fixtureCompare
+  fixtureCompare: _fixtureCompare,
+  commit
 } = require('git-fixtures');
 const { isGitClean } = require('git-diff-apply');
 const emberCliUpdate = require('../../src');
@@ -257,7 +259,15 @@ applicable codemods: `);
       fixturesPath: 'test/fixtures/app/merge',
       commitMessage: 'my-app',
       to: '3.15.0',
-      statsOnly: true
+      statsOnly: true,
+      async beforeMerge() {
+        await fs.remove(path.join(tmpPath, 'config/ember-cli-update.json'));
+
+        await commit({
+          m: 'my-app',
+          cwd: tmpPath
+        });
+      }
     });
 
     expect(await isGitClean({ cwd: tmpPath })).to.be.ok;
