remove unneeded findBlueprint

Author: Kelly Selden

src/check-for-blueprint-updates.js

@@ -17,41 +17,25 @@ async function checkForBlueprintUpdates({
       blueprint: blueprint.location || blueprint.packageName
     });
 
-    let currentVersion;
+    let currentVersion = blueprint.version;
     let latestVersion;
 
     if (parsedPackage.name) {
       let versions = await getVersions(parsedPackage.name);
 
-      let tagVersions = await Promise.all([
-        getTagVersion({
-          range: blueprint.version,
-          versions,
-          packageName: blueprint.packageName
-        }),
-        getTagVersion({
-          range: toDefault,
-          versions,
-          packageName: blueprint.packageName
-        })
-      ]);
-
-      currentVersion = tagVersions[0];
-      latestVersion = tagVersions[1];
+      latestVersion = await getTagVersion({
+        range: toDefault,
+        versions,
+        packageName: blueprint.packageName
+      });
     } else {
-      let packages = await Promise.all([
-        downloadPackage(parsedPackage.name, parsedPackage.url, blueprint.version),
-        downloadPackage(parsedPackage.name, parsedPackage.url, toDefault)
-      ]);
+      let downloadedPackage = await downloadPackage(parsedPackage.name, parsedPackage.url, toDefault);
 
-      currentVersion = packages[0].version;
-      latestVersion = packages[1].version;
+      latestVersion = downloadedPackage.version;
     }
 
     return {
-      packageName: blueprint.packageName,
-      name: blueprint.name,
-      currentVersion,
+      blueprint,
       latestVersion,
       isUpToDate: currentVersion === latestVersion
     };

src/choose-blueprint-updates.js

@@ -2,17 +2,15 @@
 
 const checkForBlueprintUpdates = require('./check-for-blueprint-updates');
 const inquirer = require('inquirer');
-const findBlueprint = require('./find-blueprint');
 const loadSafeBlueprint = require('./load-safe-blueprint');
 
 const toDefault = require('./args').to.default;
 
 function formatBlueprintLine({
-  name,
-  currentVersion,
+  blueprint,
   latestVersion
 }) {
-  return `${name}, current: ${currentVersion}, latest: ${latestVersion}`;
+  return `${blueprint.name}, current: ${blueprint.version}, latest: ${latestVersion}`;
 }
 
 async function chooseBlueprint({
@@ -82,7 +80,7 @@ async function chooseBlueprintUpdates({
         message: 'Blueprint updates have been found. Which one would you like to update?'
       });
 
-      existingBlueprint = findBlueprint(emberCliUpdateJson, blueprintUpdate.packageName, blueprintUpdate.name);
+      existingBlueprint = blueprintUpdate.blueprint;
 
       let latestVersion = `${blueprintUpdate.latestVersion} (latest)`;
 

test/integration/check-for-blueprint-updates-test.js

@@ -42,23 +42,17 @@ describe(checkForBlueprintUpdates, function() {
 
     expect(blueprintUpdates).to.deep.equal([
       {
-        packageName: localBlueprint.packageName,
-        name: localBlueprint.name,
-        currentVersion: localBlueprint.version,
+        blueprint: localBlueprint,
         latestVersion: (await loadSafeBlueprintFile('test/fixtures/blueprint/app/local-app/merge/my-app/config/ember-cli-update.json')).blueprints[1].version,
         isUpToDate: false
       },
       {
-        packageName: urlBlueprint.packageName,
-        name: urlBlueprint.name,
-        currentVersion: urlBlueprint.version,
+        blueprint: urlBlueprint,
         latestVersion: (await loadSafeBlueprintFile('test/fixtures/blueprint/app/remote-app/merge/my-app/config/ember-cli-update.json')).blueprints[0].version,
         isUpToDate: false
       },
       {
-        packageName: npmBlueprint.packageName,
-        name: npmBlueprint.name,
-        currentVersion: npmBlueprint.version,
+        blueprint: npmBlueprint,
         latestVersion: npmBlueprint.version,
         isUpToDate: true
       }