Generalize package manager APM -> PM

Author: dapplion

src/commands/increase.ts

@@ -1,7 +1,13 @@
 import { CommandModule } from "yargs";
-import { increaseFromLocalVersion } from "../utils/versions/increaseFromLocalVersion";
-import { CliGlobalOptions, ReleaseType } from "../types";
+import semver, { ReleaseType } from "semver";
+import { CliGlobalOptions } from "../types";
 import { defaultComposeFileName, defaultDir } from "../params";
+import { readManifest, writeManifest } from "../utils/manifest";
+import {
+  readCompose,
+  updateComposeImageTags,
+  writeCompose
+} from "../utils/compose";
 
 export const command = "increase [type]";
 
@@ -38,9 +44,24 @@ export async function increaseHandler({
   dir = defaultDir,
   compose_file_name = defaultComposeFileName
 }: CliCommandOptions): Promise<string> {
-  return await increaseFromLocalVersion({
-    type: type as ReleaseType,
-    dir,
-    compose_file_name
-  });
+  const composeFileName = compose_file_name;
+
+  // Load manifest
+  const { manifest, format } = readManifest({ dir });
+
+  const currentVersion = manifest.version;
+
+  // Increase the version
+  const nextVersion = semver.inc(currentVersion, type as ReleaseType);
+  if (!nextVersion) throw Error(`Invalid increase: ${currentVersion} ${type}`);
+  manifest.version = nextVersion;
+
+  // Mofidy and write the manifest and docker-compose
+  writeManifest(manifest, format, { dir });
+  const { name, version } = manifest;
+  const compose = readCompose({ dir, composeFileName });
+  const newCompose = updateComposeImageTags(compose, { name, version });
+  writeCompose(newCompose, { dir, composeFileName });
+
+  return nextVersion;
 }

src/commands/next.ts

@@ -1,8 +1,9 @@
 import { CommandModule } from "yargs";
-import { getNextVersionFromApm } from "../utils/versions/getNextVersionFromApm";
-import { verifyEthConnection } from "../utils/verifyEthConnection";
+import semver from "semver";
 import { CliGlobalOptions, ReleaseType } from "../types";
 import { defaultDir } from "../params";
+import { getPM, verifyEthConnection } from "../providers/pm";
+import { readManifest } from "../utils/manifest";
 
 interface CliCommandOptions extends CliGlobalOptions {
   type: string;
@@ -11,7 +12,7 @@ interface CliCommandOptions extends CliGlobalOptions {
 
 export const next: CommandModule<CliGlobalOptions, CliCommandOptions> = {
   command: "next [type]",
-  describe: "Compute the next release version from local",
+  describe: "Compute the next release version from published repo",
 
   builder: yargs =>
     yargs
@@ -45,12 +46,18 @@ export async function nextHandler({
 }: CliCommandOptions): Promise<string> {
   const ethProvider = provider;
 
-  await verifyEthConnection(ethProvider);
+  const pm = getPM(ethProvider);
+  await verifyEthConnection(pm);
+
+  const { manifest } = readManifest({ dir });
+  const latestVersion = await pm.getLatestVersion(manifest.name);
+
+  const nextVersion = semver.inc(latestVersion, type as ReleaseType);
+  if (!nextVersion)
+    throw Error(
+      `Error computing next version, is this increase type correct? type: ${type}`
+    );
 
   // Execute command
-  return await getNextVersionFromApm({
-    type: type as ReleaseType,
-    ethProvider,
-    dir
-  });
+  return nextVersion;
 }

src/commands/publish.ts

@@ -7,14 +7,13 @@ import { buildAndUpload } from "../tasks/buildAndUpload";
 import { generatePublishTx } from "../tasks/generatePublishTx";
 import { createGithubRelease } from "../tasks/createGithubRelease";
 // Utils
-import { getCurrentLocalVersion } from "../utils/versions/getCurrentLocalVersion";
-import { increaseFromApmVersion } from "../utils/versions/increaseFromApmVersion";
-import { verifyEthConnection } from "../utils/verifyEthConnection";
-import { getInstallDnpLink, getPublishTxLink } from "../utils/getLinks";
+import { increaseFromRemoteVersion } from "../utils/increaseFromRemoteVersion";
+import { getInstallDnpLink } from "../utils/getLinks";
 import { defaultComposeFileName, defaultDir, YargsError } from "../params";
 import { CliGlobalOptions, ReleaseType, releaseTypes, TxData } from "../types";
 import { printObject } from "../utils/print";
 import { UploadTo } from "../releaseUploader";
+import { getPM, verifyEthConnection } from "../providers/pm";
 
 const typesList = releaseTypes.join(" | ");
 
@@ -88,9 +87,12 @@ export const publish: CommandModule<CliGlobalOptions, CliCommandOptions> = {
       }),
 
   handler: async args => {
-    const { txData, nextVersion, releaseMultiHash } = await publishHanlder(
-      args
-    );
+    const {
+      txData,
+      nextVersion,
+      releaseMultiHash,
+      txPublishLink
+    } = await publishHanlder(args);
 
     if (!args.silent) {
       const txDataToPrint = {
@@ -113,7 +115,7 @@ export const publish: CommandModule<CliGlobalOptions, CliCommandOptions> = {
   
   ${"You can also execute this transaction with Metamask by following this pre-filled link"}
   
-  ${chalk.cyan(getPublishTxLink(txData))}
+  ${chalk.cyan(txPublishLink)}
   `);
     }
   }
@@ -143,6 +145,7 @@ export async function publishHanlder({
   txData: TxData;
   nextVersion: string;
   releaseMultiHash: string;
+  txPublishLink: string;
 }> {
   // Parse optionsalias: "release",
   let ethProvider = provider || eth_provider;
@@ -195,27 +198,22 @@ export async function publishHanlder({
       `Invalid release type "${type}", must be: ${typesList}`
     );
 
-  await verifyEthConnection(ethProvider);
+  const pm = getPM(ethProvider);
+  await verifyEthConnection(pm);
 
   const publishTasks = new Listr(
     [
       // 1. Fetch current version from APM
       {
         title: "Fetch current version from APM",
         task: async (ctx, task) => {
-          let nextVersion;
-          try {
-            nextVersion = await increaseFromApmVersion({
-              type: type as ReleaseType,
-              ethProvider,
-              dir,
-              composeFileName
-            });
-          } catch (e) {
-            if (e.message.includes("NOREPO"))
-              nextVersion = getCurrentLocalVersion({ dir });
-            else throw e;
-          }
+          const nextVersion = await increaseFromRemoteVersion({
+            type: type as ReleaseType,
+            pm,
+            dir,
+            composeFileName
+          });
+
           ctx.nextVersion = nextVersion;
           ctx.buildDir = path.join(dir, `build_${nextVersion}`);
           task.title = task.title + ` (next version: ${nextVersion})`;
@@ -276,6 +274,11 @@ export async function publishHanlder({
   );
 
   const tasksFinalCtx = await publishTasks.run();
-  const { txData, nextVersion, releaseMultiHash } = tasksFinalCtx;
-  return { txData, nextVersion, releaseMultiHash };
+  const {
+    txData,
+    nextVersion,
+    releaseMultiHash,
+    txPublishLink
+  } = tasksFinalCtx;
+  return { txData, nextVersion, releaseMultiHash, txPublishLink };
 }