occam-open-cli 6.0.22 → 6.0.23

package/bin/configuration/version_5_0.js

@@ -1,23 +1,7 @@
 "use strict";
 
 const { HOST_URL } = require("../constants"),
-      { VERSION_5_0 } = require("../versions"),
-      { DEFAULT_HOST } = require("../defaults");
-
-function createConfiguration() {
-  const version = VERSION_5_0,
-        host = DEFAULT_HOST,
-        options = {},
-        identityToken = null,
-        configuration = {
-          version,
-          host,
-          options,
-          identityToken
-        };
-
-  return configuration;
-}
+      { VERSION_5_0 } = require("../versions");
 
 function migrateConfigurationToVersion_5_0(configuration) {
   const { hostURL } = configuration,
@@ -37,6 +21,5 @@ function migrateConfigurationToVersion_5_0(configuration) {
 }
 
 module.exports = {
-  createConfiguration,
   migrateConfigurationToVersion_5_0
 };

package/bin/configuration.js

@@ -1,16 +1,17 @@
 "use strict";
 
-const { configurationUtilities } = require("necessary");
+const { versionUtilities, configurationUtilities } = require("necessary");
 
 const { OPEN } = require("./constants"),
-      { migrateConfigurationToVersion_1_5 } = require("./configuration/version_1_5"),
+      { createConfiguration } = require("./configuration/version_5_1"),
       { migrateConfigurationToVersion_2_0 } = require("./configuration/version_2_0"),
       { migrateConfigurationToVersion_5_0 } = require("./configuration/version_5_0"),
+      { migrateConfigurationToVersion_5_1 } = require("./configuration/version_5_1"),
       { CONFIGURATION_FILE_DOES_NOT_EXIST_MESSAGE } = require("./messages"),
-      { migrateConfigurationToVersion_5_1, createConfiguration } = require("./configuration/version_5_1"),
-      { UNVERSIONED, VERSION_1_5, VERSION_2_0, VERSION_5_0, CURRENT_VERSION } = require("./versions");
+      { VERSION_1_5, VERSION_2_0, VERSION_5_0, VERSION_5_1 } = require("./versions");
 
 const { rc } = configurationUtilities,
+      { migrate } = versionUtilities,
       { setRCBaseExtension, checkRCFileExists, updateRCFile, writeRCFile, readRCFile } = rc;
 
 const rcBaseExtension = OPEN;
@@ -75,37 +76,16 @@ function createConfigurationFile() {
 }
 
 function migrateConfigurationFile() {
-  let json = readRCFile(),
-      configuration = json, ///
-      { version = UNVERSIONED } = configuration;
+  let json = readRCFile();
 
-  while (version !== CURRENT_VERSION) {
-    switch (version) {
-      case UNVERSIONED :
-        configuration = migrateConfigurationToVersion_1_5(configuration);
+  const migrationMap = {
+          [ VERSION_1_5 ]: migrateConfigurationToVersion_2_0,
+          [ VERSION_2_0 ]: migrateConfigurationToVersion_5_0,
+          [ VERSION_5_0 ] :migrateConfigurationToVersion_5_1
+        },
+        latestVersion = VERSION_5_1;
 
-        break;
-
-      case VERSION_1_5 :
-        configuration = migrateConfigurationToVersion_2_0(configuration);
-
-        break;
-
-      case VERSION_2_0 :
-        configuration = migrateConfigurationToVersion_5_0(configuration);
-
-        break;
-
-      case VERSION_5_0 :
-        configuration = migrateConfigurationToVersion_5_1(configuration);
-
-        break;
-    }
-
-    ({ version } = configuration);
-  }
-
-  json = configuration; ///
+  json = migrate(json, migrationMap, latestVersion);
 
   writeRCFile(json);
 }

package/bin/post.js

@@ -1,15 +1,15 @@
 "use strict";
 
 const { Readable } = require("stream"),
-      { headers, contentTypes, statusCodes, requestUtilities } = require("necessary");
+      { headers, contentTypes, statusCodes, requestUtilities, packageUtilities } = require("necessary");
 
 const { retrieveHost } = require("./configuration"),
-      { getPackageVersion } = require("./utilities/packageJSON"),
       { contentFromResponse } = require("./utilities/response"),
       { statusMessageFromStatusCode } = require("./utilities/status"),
       { SERVER_FAILED_TO_RESPOND_ERROR_MESSAGE } = require("./messages");
 
-const { createPostRequest } = requestUtilities,
+const { getVersion } = packageUtilities,
+      { createPostRequest } = requestUtilities,
       { OK_200_STATUS_CODE } = statusCodes,
       { CONTENT_TYPE_HEADER } = headers,
       { APPLICATION_JSON_CHARSET_UTF_8_CONTENT_TYPE } = contentTypes;
@@ -17,9 +17,12 @@ const { createPostRequest } = requestUtilities,
 function post(uri, json, callback) {
   const host = retrieveHost(),
         query = {},
-        headers = getHeaders(),
+        headers = {
+          [ CONTENT_TYPE_HEADER ]: APPLICATION_JSON_CHARSET_UTF_8_CONTENT_TYPE
+        },
+        version = getVersion(),
         content = JSON.stringify(json), ///
-        versionString = getVersionString();
+        versionString = version;  ///
 
   Object.assign(json, {
     versionString
@@ -67,18 +70,3 @@ function post(uri, json, callback) {
 }
 
 module.exports = post;
-
-function getHeaders() {
-  const headers = {};
-
-  headers[CONTENT_TYPE_HEADER] = APPLICATION_JSON_CHARSET_UTF_8_CONTENT_TYPE;
-
-  return headers;
-}
-
-function getVersionString() {
-  const packageVersion = getPackageVersion(),
-        versionString = packageVersion; ///
-
-  return versionString;
-}

package/bin/versions.js

@@ -1,17 +1,13 @@
 "use strict";
 
-const UNVERSIONED = "unversioned",
-      VERSION_1_5 = "1.5",
+const VERSION_1_5 = "1.5",
       VERSION_2_0 = "2.0",
       VERSION_5_0 = "5.0",
-      VERSION_5_1 = "5.1",
-      CURRENT_VERSION = VERSION_5_1;  ///
+      VERSION_5_1 = "5.1";
 
 module.exports = {
-  UNVERSIONED,
   VERSION_1_5,
   VERSION_2_0,
   VERSION_5_0,
-  VERSION_5_1,
-  CURRENT_VERSION
+  VERSION_5_1
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-open-cli",
   "author": "James Smith",
-  "version": "6.0.22",
+  "version": "6.0.23",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-open-cli",
   "description": "Occam's command line package management tool.",
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "argumentative": "^2.0.21",
-    "necessary": "^11.8.4",
+    "necessary": "^11.9.0",
     "occam-file-system": "^5.0.240"
   },
   "scripts": {},

package/bin/configuration/version_1_5.js

@@ -1,36 +0,0 @@
-"use strict";
-
-const { VERSION_1_5 } = require("../versions"),
-      { DEFAULT_GITHUB_HOST_NAME } = require("../defaults");
-
-function migrateConfigurationToVersion_1_5(configuration) {
-  let { options } = configuration;
-
-  const version = VERSION_1_5,  ///
-        { useSSH, hostURL, hostNameSuffix } = options;
-
-  options = {};
-
-  if (useSSH) {
-    const gitHubHostName = `${DEFAULT_GITHUB_HOST_NAME}${hostNameSuffix}`,
-          ssh = {
-            gitHubHostName
-          };
-
-    Object.assign(options, {
-      ssh
-    });
-  }
-
-  configuration = {
-    version,
-    options,
-    hostURL
-  };
-
-  return configuration;
-}
-
-module.exports = {
-  migrateConfigurationToVersion_1_5
-};