share code between reset and stats

Author: Kelly Selden

src/get-blueprint-from-args.js

@@ -0,0 +1,40 @@
+'use strict';
+
+const parseBlueprintPackage = require('./parse-blueprint-package');
+const resolvePackage = require('./resolve-package');
+const findBlueprint = require('./find-blueprint');
+const { defaultTo } = require('./constants');
+
+async function getBlueprintFromArgs({
+  cwd,
+  emberCliUpdateJson,
+  blueprint,
+  to = defaultTo
+}) {
+  let parsedPackage = await parseBlueprintPackage({
+    cwd,
+    blueprint
+  });
+  let url = parsedPackage.url;
+
+  let packageInfo = await resolvePackage({
+    name: parsedPackage.name,
+    url,
+    range: to
+  });
+
+  let packageName = packageInfo.name;
+  let name = packageInfo.name;
+
+  let existingBlueprint = findBlueprint(emberCliUpdateJson, packageName, name);
+  if (!existingBlueprint) {
+    throw `blueprint "${blueprint}" was not found`;
+  }
+
+  return {
+    packageInfo,
+    existingBlueprint
+  };
+}
+
+module.exports = getBlueprintFromArgs;

src/reset.js

@@ -6,121 +6,116 @@ const parseBlueprintPackage = require('./parse-blueprint-package');
 const saveBlueprint = require('./save-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');
+const getBlueprintFromArgs = require('./get-blueprint-from-args');
 
 module.exports = async function reset({
   blueprint: _blueprint,
   to = defaultTo
 }) {
-  let cwd = process.cwd();
+  try {
+    let cwd = process.cwd();
 
-  // A custom config location in package.json may be reset/init away,
-  // so we can no longer look it up on the fly after the run.
-  // We must rely on a lookup before the run.
-  let emberCliUpdateJsonPath = await getBlueprintFilePath(cwd);
+    // A custom config location in package.json may be reset/init away,
+    // so we can no longer look it up on the fly after the run.
+    // We must rely on a lookup before the run.
+    let emberCliUpdateJsonPath = await getBlueprintFilePath(cwd);
 
-  let emberCliUpdateJson = await loadSafeBlueprintFile(emberCliUpdateJsonPath);
+    let emberCliUpdateJson = await loadSafeBlueprintFile(emberCliUpdateJsonPath);
 
-  let { blueprints } = emberCliUpdateJson;
+    let { blueprints } = emberCliUpdateJson;
 
-  if (!blueprints.length) {
-    throw new Error('No blueprints found.');
-  }
+    if (!blueprints.length) {
+      throw 'no blueprints found';
+    }
 
-  let blueprint;
-  let packageInfo;
+    let blueprint;
+    let packageInfo;
+
+    if (_blueprint) {
+      let {
+        packageInfo: _packageInfo,
+        existingBlueprint
+      } = await getBlueprintFromArgs({
+        cwd,
+        emberCliUpdateJson,
+        blueprint: _blueprint,
+        to
+      });
 
-  if (_blueprint) {
-    let parsedPackage = await parseBlueprintPackage({
-      cwd,
-      blueprint: _blueprint
-    });
-    let url = parsedPackage.url;
+      packageInfo = _packageInfo;
+      blueprint = existingBlueprint;
+    } else {
+      let {
+        blueprint: _blueprint
+      } = await chooseBlueprintUpdates({
+        cwd,
+        emberCliUpdateJson,
+        reset: true
+      });
 
-    packageInfo = await resolvePackage({
-      name: parsedPackage.name,
-      url,
-      range: to
-    });
+      blueprint = _blueprint;
 
-    let packageName = packageInfo.name;
-    let name = packageInfo.name;
+      let parsedPackage = await parseBlueprintPackage({
+        cwd,
+        blueprint: blueprint.location || blueprint.packageName
+      });
+      let url = parsedPackage.url;
 
-    let existingBlueprint = findBlueprint(emberCliUpdateJson, packageName, name);
-    if (!existingBlueprint) {
-      throw new Error('Blueprint not found.');
+      packageInfo = await resolvePackage({
+        name: blueprint.packageName,
+        url,
+        range: to
+      });
     }
 
-    blueprint = existingBlueprint;
-  } else {
-    let {
-      blueprint: _blueprint
-    } = await chooseBlueprintUpdates({
-      cwd,
-      emberCliUpdateJson,
-      reset: true
-    });
-
-    blueprint = _blueprint;
+    blueprint.version = packageInfo.version;
+    blueprint.path = packageInfo.path;
 
-    let parsedPackage = await parseBlueprintPackage({
-      cwd,
-      blueprint: blueprint.location || blueprint.packageName
-    });
-    let url = parsedPackage.url;
+    let baseBlueprint;
+    if (!blueprint.isBaseBlueprint) {
+      baseBlueprint = await getBaseBlueprint({
+        cwd,
+        blueprints,
+        blueprint
+      });
+    }
 
-    packageInfo = await resolvePackage({
-      name: blueprint.packageName,
-      url,
-      range: to
+    let {
+      promise,
+      resolveConflictsProcess
+    } = await boilerplateUpdate({
+      endVersion: blueprint.version,
+      reset: true,
+      createCustomDiff: true,
+      customDiffOptions: ({
+        packageJson
+      }) => getStartAndEndCommands({
+        packageJson,
+        baseBlueprint,
+        endBlueprint: blueprint
+      }),
+      ignoredFiles: [await getBlueprintRelativeFilePath(cwd)]
     });
-  }
-
-  blueprint.version = packageInfo.version;
-  blueprint.path = packageInfo.path;
 
-  let baseBlueprint;
-  if (!blueprint.isBaseBlueprint) {
-    baseBlueprint = await getBaseBlueprint({
-      cwd,
-      blueprints,
-      blueprint
-    });
+    return {
+      promise: (async() => {
+        let result = await promise;
+
+        await saveBlueprint({
+          emberCliUpdateJsonPath,
+          blueprint
+        });
+
+        return result;
+      })(),
+      resolveConflictsProcess
+    };
+  } catch (err) {
+    return { promise: Promise.reject(err) };
   }
-
-  let {
-    promise,
-    resolveConflictsProcess
-  } = await boilerplateUpdate({
-    endVersion: blueprint.version,
-    reset: true,
-    createCustomDiff: true,
-    customDiffOptions: ({
-      packageJson
-    }) => getStartAndEndCommands({
-      packageJson,
-      baseBlueprint,
-      endBlueprint: blueprint
-    }),
-    ignoredFiles: [await getBlueprintRelativeFilePath(cwd)]
-  });
-
-  return {
-    promise: (async() => {
-      let result = await promise;
-
-      await saveBlueprint({
-        emberCliUpdateJsonPath,
-        blueprint
-      });
-
-      return result;
-    })(),
-    resolveConflictsProcess
-  };
 };

src/stats.js

@@ -4,7 +4,7 @@ const getBlueprintFilePath = require('./get-blueprint-file-path');
 const loadSafeBlueprintFile = require('./load-safe-blueprint-file');
 const checkForBlueprintUpdates = require('./check-for-blueprint-updates');
 const { formatBlueprintLine } = require('./choose-blueprint-updates');
-const findBlueprint = require('./find-blueprint');
+const getBlueprintFromArgs = require('./get-blueprint-from-args');
 
 module.exports = async function stats({
   blueprint
@@ -17,12 +17,18 @@ module.exports = async function stats({
 
   let { blueprints } = emberCliUpdateJson;
 
-  if (blueprint) {
-    let existingBlueprint = findBlueprint(emberCliUpdateJson, blueprint, blueprint);
+  if (!blueprints.length) {
+    throw 'no blueprints found';
+  }
 
-    if (!existingBlueprint) {
-      throw `blueprint "${blueprint}" was not found`;
-    }
+  if (blueprint) {
+    let {
+      existingBlueprint
+    } = await getBlueprintFromArgs({
+      cwd,
+      emberCliUpdateJson,
+      blueprint
+    });
 
     blueprints = [existingBlueprint];
   }

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

@@ -726,7 +726,7 @@ describe(function() {
       fixturesPath: 'test/fixtures/blueprint/app/local-app/local',
       commitMessage: 'my-app',
       stats: true,
-      blueprint: packageName,
+      blueprint: location,
       async beforeMerge() {
         await initBlueprint({
           fixturesPath: 'test/fixtures/blueprint/app/local',

test/integration/reset-test.js

@@ -102,4 +102,33 @@ describe(reset, function() {
 
     assertNoStaged(status);
   });
+
+  it('handles missing blueprint', async function() {
+    let {
+      stderr,
+      status
+    } = await merge({
+      fixturesPath: 'test/fixtures/blueprint/app/local-app/local',
+      commitMessage: 'my-app',
+      blueprint: 'missing'
+    });
+
+    assertNoStaged(status);
+
+    expect(stderr).to.equal('blueprint "missing" was not found');
+  });
+
+  it('handles no blueprints', async function() {
+    let {
+      stderr,
+      status
+    } = await merge({
+      fixturesPath: 'test/fixtures/app/local',
+      commitMessage: 'my-app'
+    });
+
+    assertNoStaged(status);
+
+    expect(stderr).to.equal('no blueprints found');
+  });
 });

test/integration/stats-test.js

@@ -111,4 +111,18 @@ ${packageName2}, current: ${from2}, latest: ${to2}`);
 
     expect(stderr).to.equal('blueprint "missing" was not found');
   });
+
+  it('handles no blueprints', async function() {
+    let {
+      stderr,
+      status
+    } = await merge({
+      fixturesPath: 'test/fixtures/app/local',
+      commitMessage: 'my-app'
+    });
+
+    assertNoStaged(status);
+
+    expect(stderr).to.equal('no blueprints found');
+  });
 });