remove base default insertion

Author: Kelly Selden

bin/commands/init.js

@@ -14,12 +14,14 @@ module.exports.builder = {
   reset: args['reset']
 };
 
+module.exports.blueprintOptionsDefault = [];
+
 module.exports.handler = async function handler(argv) {
   let blueprint = argv['blueprint'];
   let to = argv['to'];
   let resolveConflicts = argv['resolve-conflicts'];
   let reset = argv['reset'];
-  let blueprintOptions = argv['--'] || [];
+  let blueprintOptions = argv['--'] || module.exports.blueprintOptionsDefault;
 
   try {
     let message = await init({

src/get-base-blueprint.js

@@ -2,7 +2,6 @@
 
 const parseBlueprintPackage = require('./parse-blueprint-package');
 const downloadPackage = require('./download-package');
-const loadDefaultBlueprintFromDisk = require('./load-default-blueprint-from-disk');
 const loadSafeBlueprint = require('./load-safe-blueprint');
 const isDefaultBlueprint = require('./is-default-blueprint');
 
@@ -12,7 +11,6 @@ async function getBaseBlueprint({
   blueprint
 }) {
   let baseBlueprint;
-  let defaultBlueprint;
 
   let isCustomBlueprint = !isDefaultBlueprint(blueprint);
 
@@ -35,16 +33,10 @@ async function getBaseBlueprint({
           baseBlueprint.path = downloadedPackage.path;
         }
       }
-    } else {
-      defaultBlueprint = await loadDefaultBlueprintFromDisk(cwd);
-      baseBlueprint = defaultBlueprint;
     }
   }
 
-  return {
-    baseBlueprint,
-    defaultBlueprint
-  };
+  return baseBlueprint;
 }
 
 module.exports = getBaseBlueprint;

src/index.js

@@ -11,7 +11,6 @@ const boilerplateUpdate = require('boilerplate-update');
 const getStartAndEndCommands = require('./get-start-and-end-commands');
 const parseBlueprintPackage = require('./parse-blueprint-package');
 const downloadPackage = require('./download-package');
-const loadBlueprintFile = require('./load-blueprint-file');
 const loadSafeBlueprintFile = require('./load-safe-blueprint-file');
 const saveBlueprint = require('./save-blueprint');
 const loadDefaultBlueprint = require('./load-default-blueprint');
@@ -158,10 +157,7 @@ module.exports = async function emberCliUpdate({
     createCustomDiff = true;
   }
 
-  let {
-    baseBlueprint,
-    defaultBlueprint
-  } = await getBaseBlueprint({
+  let baseBlueprint = await getBaseBlueprint({
     cwd,
     emberCliUpdateJson,
     blueprint
@@ -258,32 +254,7 @@ module.exports = async function emberCliUpdate({
     wasRunAsExecutable
   })).promise;
 
-  if (_blueprint) {
-    let emberCliUpdateJson = await loadBlueprintFile(emberCliUpdateJsonPath);
-
-    // If you don't have a state file, save the default blueprint,
-    // even if you are currently working on a custom blueprint.
-    if (!emberCliUpdateJson || !isCustomBlueprint) {
-      await saveBlueprint({
-        emberCliUpdateJsonPath,
-        blueprint: defaultBlueprint
-      });
-    }
-
-    if (isCustomBlueprint) {
-      await saveBlueprint({
-        emberCliUpdateJsonPath,
-        blueprint: endBlueprint
-      });
-    }
-
-    if (!reset) {
-      await stageBlueprintFile({
-        cwd,
-        emberCliUpdateJsonPath
-      });
-    }
-  } else if (isPersistedBlueprint) {
+  if (_blueprint || isPersistedBlueprint) {
     await saveBlueprint({
       emberCliUpdateJsonPath,
       blueprint: endBlueprint

src/init.js

@@ -9,19 +9,24 @@ const loadSafeBlueprint = require('./load-safe-blueprint');
 const loadSafeBlueprintFile = require('./load-safe-blueprint-file');
 const stageBlueprintFile = require('./stage-blueprint-file');
 const { getBlueprintRelativeFilePath } = require('./get-blueprint-file-path');
-const loadBlueprintFile = require('./load-blueprint-file');
-const bootstrap = require('./bootstrap');
 const findBlueprint = require('./find-blueprint');
 const getBaseBlueprint = require('./get-base-blueprint');
 const getBlueprintFilePath = require('./get-blueprint-file-path');
 const resolvePackage = require('./resolve-package');
 
+const {
+  'to': { default: toDefault }
+} = require('./args');
+const {
+  blueprintOptionsDefault
+} = require('../bin/commands/init');
+
 module.exports = async function init({
   blueprint: _blueprint,
-  to,
+  to = toDefault,
   resolveConflicts,
   reset,
-  blueprintOptions,
+  blueprintOptions = blueprintOptionsDefault,
   wasRunAsExecutable
 }) {
   let cwd = process.cwd();
@@ -84,9 +89,7 @@ module.exports = async function init({
   blueprint.version = version;
   blueprint.path = path;
 
-  let {
-    baseBlueprint
-  } = await getBaseBlueprint({
+  let baseBlueprint = await getBaseBlueprint({
     cwd,
     emberCliUpdateJson,
     blueprint
@@ -117,10 +120,6 @@ module.exports = async function init({
     wasRunAsExecutable
   })).promise;
 
-  if (!await loadBlueprintFile(emberCliUpdateJsonPath)) {
-    await bootstrap();
-  }
-
   await saveBlueprint({
     emberCliUpdateJsonPath,
     blueprint

src/save.js

@@ -4,7 +4,6 @@ const parseBlueprintPackage = require('./parse-blueprint-package');
 const loadSafeBlueprint = require('./load-safe-blueprint');
 const saveBlueprint = require('./save-blueprint');
 const loadBlueprintFile = require('./load-blueprint-file');
-const bootstrap = require('./bootstrap');
 const getBlueprintFilePath = require('./get-blueprint-file-path');
 const resolvePackage = require('./resolve-package');
 
@@ -47,7 +46,7 @@ module.exports = async function save({
   });
 
   if (!await loadBlueprintFile(emberCliUpdateJsonPath)) {
-    await bootstrap();
+    blueprint.isBaseBlueprint = true;
   }
 
   await saveBlueprint({

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

@@ -7,7 +7,8 @@ const { expect } = require('../helpers/chai');
 const {
   buildTmp,
   processBin,
-  fixtureCompare: _fixtureCompare
+  fixtureCompare: _fixtureCompare,
+  commit
 } = require('git-fixtures');
 const {
   assertNormalUpdate,
@@ -550,27 +551,48 @@ describe(function() {
   });
 
   it('can save an old blueprint\'s state', async function() {
-    let {
-      location,
-      version: from
-    } = (await loadSafeBlueprintFile('test/fixtures/blueprint/app/local-app/local/my-app/config/ember-cli-update.json')).blueprints[1];
+    let [
+      {
+        packageName,
+        version: base
+      },
+      {
+        location,
+        version: partial,
+        options
+      }
+    ] = (await loadSafeBlueprintFile('test/fixtures/blueprint/app/local-app/local/my-app/config/ember-cli-update.json')).blueprints;
 
-    let {
-      status
-    } = await (await merge({
+    let commitMessage = 'my-app';
+
+    await (await merge({
       fixturesPath: 'test/fixtures/blueprint/app/local-app/init',
-      commitMessage: 'my-app',
+      commitMessage,
       save: true,
-      blueprint: location,
-      blueprintOptions: ['--supplied-option=foo'],
-      from,
-      async beforeMerge() {
-        await initBlueprint({
-          fixturesPath: 'test/fixtures/blueprint/app/local',
-          resolvedFrom: tmpPath,
-          relativeDir: location
-        });
-      }
+      from: base,
+      blueprint: packageName
+    })).promise;
+
+    await initBlueprint({
+      fixturesPath: path.resolve(__dirname, '../fixtures/blueprint/app/local'),
+      resolvedFrom: tmpPath,
+      relativeDir: location
+    });
+
+    let {
+      status
+    } = await (await processBin({
+      binFile: 'ember-cli-update',
+      args: [
+        'save',
+        `-b=${location}`,
+        `--from=${partial}`,
+        '--',
+        ...options
+      ],
+      cwd: tmpPath,
+      commitMessage,
+      expect
     })).promise;
 
     assertNoStaged(status);
@@ -594,22 +616,36 @@ describe(function() {
       version: to
     } = (await loadSafeBlueprintFile('test/fixtures/blueprint/app/legacy-app/merge/my-app/config2/ember-cli-update.json')).blueprints[1];
 
-    let {
-      status
-    } = await (await merge({
+    await (await merge({
       fixturesPath: 'test/fixtures/blueprint/app/legacy-app/init',
       commitMessage: 'my-app',
-      blueprint: location,
-      from,
-      to,
-      blueprintOptions: options,
-      async beforeMerge() {
-        await initBlueprint({
-          fixturesPath: 'test/fixtures/blueprint/app/legacy',
-          resolvedFrom: tmpPath,
-          relativeDir: location
-        });
-      }
+      bootstrap: true
+    })).promise;
+
+    let commitMessage = 'bootstrap';
+
+    await commit({ m: commitMessage, cwd: tmpPath });
+
+    await initBlueprint({
+      fixturesPath: path.resolve(__dirname, '../fixtures/blueprint/app/legacy'),
+      resolvedFrom: tmpPath,
+      relativeDir: location
+    });
+
+    let {
+      status
+    } = await (await processBin({
+      binFile: 'ember-cli-update',
+      args: [
+        `-b=${location}`,
+        `--from=${from}`,
+        `--to=${to}`,
+        '--',
+        ...options
+      ],
+      cwd: tmpPath,
+      commitMessage,
+      expect
     })).promise;
 
     fixtureCompare({

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

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

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

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