consolidate code into resolvePackage

Author: Kelly Selden

src/index.js

@@ -23,12 +23,34 @@ const findBlueprint = require('./find-blueprint');
 const getBaseBlueprint = require('./get-base-blueprint');
 const chooseBlueprintUpdates = require('./choose-blueprint-updates');
 const getBlueprintFilePath = require('./get-blueprint-file-path');
+const resolvePackage = require('./resolve-package');
 
 const {
   'to': { default: toDefault },
   'codemods-url': { default: codemodsUrlDefault }
 } = require('./args');
 
+async function _resolvePackage(blueprint, url, range) {
+  if (blueprint.version && !url) {
+    return;
+  }
+
+  let {
+    version,
+    path
+  } = await resolvePackage({
+    name: blueprint.packageName,
+    url,
+    range
+  });
+
+  blueprint.version = version;
+
+  if (path) {
+    blueprint.path = path;
+  }
+}
+
 module.exports = async function emberCliUpdate({
   blueprint: _blueprint,
   from,
@@ -173,29 +195,13 @@ module.exports = async function emberCliUpdate({
       }
 
       endBlueprint = { ...blueprint };
+      delete endBlueprint.version;
 
       if (isCustomBlueprint) {
-        if (packageUrl) {
-          let [
-            startDownloadedPackage,
-            endDownloadedPackage
-          ] = await Promise.all([
-            startBlueprint ? downloadPackage(startBlueprint.packageName, packageUrl, startBlueprint.version) : null,
-            downloadPackage(endBlueprint.packageName, packageUrl, to)
-          ]);
-
-          if (startBlueprint) {
-            startBlueprint.path = startDownloadedPackage.path;
-            startBlueprint.version = startDownloadedPackage.version;
-          }
-
-          endBlueprint.path = endDownloadedPackage.path;
-          endBlueprint.version = endDownloadedPackage.version;
-        } else {
-          let versions = await getVersions(endBlueprint.packageName);
-          let getTagVersion = _getTagVersion(versions, endBlueprint.packageName);
-          endBlueprint.version = await getTagVersion(to);
-        }
+        await Promise.all([
+          startBlueprint ? _resolvePackage(startBlueprint, packageUrl, startBlueprint.version) : null,
+          _resolvePackage(endBlueprint, packageUrl, to)
+        ]);
       } else {
         let packageName = getPackageName(projectOptions);
         let packageVersion = getPackageVersion(packageJson, packageName);

src/init.js

@@ -3,7 +3,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 saveBlueprint = require('./save-blueprint');
 const loadDefaultBlueprintFromDisk = require('./load-default-blueprint-from-disk');
 const loadSafeBlueprint = require('./load-safe-blueprint');
@@ -14,9 +13,8 @@ const loadBlueprintFile = require('./load-blueprint-file');
 const bootstrap = require('./bootstrap');
 const findBlueprint = require('./find-blueprint');
 const getBaseBlueprint = require('./get-base-blueprint');
-const getVersions = require('boilerplate-update/src/get-versions');
-const _getTagVersion = require('./get-tag-version');
 const getBlueprintFilePath = require('./get-blueprint-file-path');
+const resolvePackage = require('./resolve-package');
 
 module.exports = async function init({
   blueprint: _blueprint,
@@ -52,19 +50,18 @@ module.exports = async function init({
     name = defaultBlueprint.name;
   }
 
-  let version;
-  let path;
-  if (url) {
-    let downloadedPackage = await downloadPackage(packageName, url, to);
-    packageName = downloadedPackage.name;
-    name = downloadedPackage.name;
-    version = downloadedPackage.version;
-    path = downloadedPackage.path;
-  } else {
-    let versions = await getVersions(packageName);
-    let getTagVersion = _getTagVersion(versions, packageName);
-    version = await getTagVersion(to);
+  let packageInfo = await resolvePackage({
+    name: packageName,
+    url,
+    range: to
+  });
+
+  packageName = packageInfo.name;
+  if (!name) {
+    name = packageInfo.name;
   }
+  let version = packageInfo.version;
+  let path = packageInfo.path;
 
   let emberCliUpdateJson = await loadSafeBlueprintFile(emberCliUpdateJsonPath);
 

src/install.js

@@ -1,15 +1,13 @@
 'use strict';
 
 const parseBlueprintPackage = require('./parse-blueprint-package');
-const downloadPackage = require('./download-package');
 const loadSafeBlueprint = require('./load-safe-blueprint');
 const saveBlueprint = require('./save-blueprint');
 const loadBlueprintFile = require('./load-blueprint-file');
 const bootstrap = require('./bootstrap');
 const emberInstallAddon = require('./ember-install-addon');
-const getVersions = require('boilerplate-update/src/get-versions');
-const _getTagVersion = require('./get-tag-version');
 const getBlueprintFilePath = require('./get-blueprint-file-path');
+const resolvePackage = require('./resolve-package');
 
 const toDefault = require('./args').to.default;
 
@@ -28,20 +26,15 @@ module.exports = async function install({
     blueprint: addon
   });
 
-  let packageName;
-  let version;
-  let path;
-  if (parsedPackage.location) {
-    let downloadedPackage = await downloadPackage(null, parsedPackage.url, toDefault);
-    packageName = downloadedPackage.name;
-    version = downloadedPackage.version;
-    path = downloadedPackage.path;
-  } else {
-    packageName = addon;
-    let versions = await getVersions(packageName);
-    let getTagVersion = _getTagVersion(versions, packageName);
-    version = await getTagVersion(toDefault);
-  }
+  let {
+    name: packageName,
+    version,
+    path
+  } = await resolvePackage({
+    name: addon,
+    url: parsedPackage.url,
+    range: toDefault
+  });
 
   // We are double installing it, via the above and the below.
   // The above is needed to resolve the real package name

src/resolve-package.js

@@ -0,0 +1,33 @@
+'use strict';
+
+const downloadPackage = require('./download-package');
+const getVersions = require('boilerplate-update/src/get-versions');
+const _getTagVersion = require('./get-tag-version');
+
+async function resolvePackage({
+  name,
+  url,
+  range
+}) {
+  let version;
+  let path;
+
+  if (url) {
+    let downloadedPackage = await downloadPackage(name, url, range);
+    name = downloadedPackage.name;
+    version = downloadedPackage.version;
+    path = downloadedPackage.path;
+  } else {
+    let versions = await getVersions(name);
+    let getTagVersion = _getTagVersion(versions, name);
+    version = await getTagVersion(range);
+  }
+
+  return {
+    name,
+    version,
+    path
+  };
+}
+
+module.exports = resolvePackage;

src/save.js

@@ -1,14 +1,12 @@
 'use strict';
 
 const parseBlueprintPackage = require('./parse-blueprint-package');
-const downloadPackage = require('./download-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 getVersions = require('boilerplate-update/src/get-versions');
-const _getTagVersion = require('./get-tag-version');
+const resolvePackage = require('./resolve-package');
 
 module.exports = async function save({
   blueprint: _blueprint,
@@ -31,19 +29,14 @@ module.exports = async function save({
     blueprint: _blueprint
   });
 
-  let packageName;
-  let version;
-
-  if (parsedPackage.location) {
-    let downloadedPackage = await downloadPackage(null, parsedPackage.url, from);
-    packageName = downloadedPackage.name;
-    version = downloadedPackage.version;
-  } else {
-    packageName = _blueprint;
-    let versions = await getVersions(packageName);
-    let getTagVersion = _getTagVersion(versions, packageName);
-    version = await getTagVersion(from);
-  }
+  let {
+    name: packageName,
+    version
+  } = await resolvePackage({
+    name: _blueprint,
+    url: parsedPackage.url,
+    range: from
+  });
 
   let blueprint = loadSafeBlueprint({
     packageName,