feat(core): support updates via git

packages/core/package.json

@@ -49,8 +49,8 @@
         "@arkecosystem/core-container": "^2.4.0-next.9",
         "@arkecosystem/core-database-postgres": "^2.4.0-next.9",
         "@arkecosystem/core-event-emitter": "^2.4.0-next.9",
-        "@arkecosystem/core-forger": "^2.4.0-next.9",
         "@arkecosystem/core-exchange-json-rpc": "^2.4.0-next.9",
+        "@arkecosystem/core-forger": "^2.4.0-next.9",
         "@arkecosystem/core-logger-pino": "^2.4.0-next.9",
         "@arkecosystem/core-p2p": "^2.4.0-next.9",
         "@arkecosystem/core-snapshots": "^2.4.0-next.9",
@@ -90,6 +90,7 @@
         "prompts": "^2.1.0",
         "read-last-lines": "^1.7.1",
         "semver": "^6.1.0",
+        "simple-git": "^1.113.0",
         "wif": "^2.0.6"
     },
     "devDependencies": {

packages/core/src/commands/config/cli.ts

@@ -14,6 +14,9 @@ $ ark config:cli --token=mine
 `,
         `Switch the npm registry channel
 $ ark config:cli --channel=next
+`,
+        `Switch the update method to git (bleeding-edge source)
+$ ark config:cli --updateMethod=git
 `,
     ];
 
@@ -25,6 +28,10 @@ $ ark config:cli --channel=next
             description: "the name of the channel that should be used",
             options: ["next", "latest"],
         }),
+        updateMethod: flags.string({
+            description: "the update method that should be used",
+            options: ["npm", "git"],
+        }),
     };
 
     public async run(): Promise<void> {
@@ -34,6 +41,10 @@ $ ark config:cli --channel=next
             configManager.set("token", flags.token as string);
         }
 
+        if (flags.updateMethod) {
+            configManager.set("updateMethod", flags.updateMethod as string);
+        }
+
         if (flags.channel) {
             this.changeChannel(flags.channel);
         }

packages/core/src/commands/update.ts

@@ -2,7 +2,10 @@ import { hasSomeProperty } from "@arkecosystem/core-utils";
 import { flags } from "@oclif/command";
 import Chalk from "chalk";
 import cli from "cli-ux";
+import { shellSync } from "execa";
 import { removeSync } from "fs-extra";
+import git from "simple-git";
+import { configManager } from "../helpers/config";
 import { confirm } from "../helpers/prompts";
 import { checkForUpdates, installFromChannel } from "../helpers/update";
 import { CommandFlags } from "../types";
@@ -43,7 +46,9 @@ export class UpdateCommand extends BaseCommand {
         const { flags } = await this.parseWithNetwork(UpdateCommand);
 
         if (flags.force) {
-            return this.performUpdate(flags, state);
+            return configManager.get("updateMethod") === "npm"
+                ? await this.performUpdateWithNpm(flags, state)
+                : await this.performUpdateWithGit(flags, state);
         }
 
         try {
@@ -55,7 +60,9 @@ export class UpdateCommand extends BaseCommand {
 
             await confirm("Would you like to update?", async () => {
                 try {
-                    await this.performUpdate(flags, state);
+                    configManager.get("updateMethod") === "npm"
+                        ? await this.performUpdateWithNpm(flags, state)
+                        : await this.performUpdateWithGit(flags, state);
                 } catch (err) {
                     this.error(err.message);
                 } finally {
@@ -67,7 +74,7 @@ export class UpdateCommand extends BaseCommand {
         }
     }
 
-    private async performUpdate(flags: CommandFlags, state: Record<string, any>): Promise<void> {
+    private async performUpdateWithNpm(flags: CommandFlags, state: Record<string, any>): Promise<void> {
         cli.action.start(`Updating from ${state.currentVersion} to ${state.updateVersion}`);
 
         await installFromChannel(state.name, state.updateVersion);
@@ -78,6 +85,34 @@ export class UpdateCommand extends BaseCommand {
 
         this.warn(`Version ${state.updateVersion} has been installed.`);
 
+        await this.confirmRestart(flags);
+    }
+
+    private async performUpdateWithGit(flags: CommandFlags, state: Record<string, any>): Promise<void> {
+        git()
+            .exec(() => cli.action.start("Pulling latest changes"))
+            .pull((err, update) => {
+                if (err) {
+                    this.error(err.message);
+                }
+
+                if (update && update.summary.changes) {
+                    shellSync("cd ../../ && yarn setup");
+                } else {
+                    this.warn("You already have the latest version.");
+                }
+            })
+            .exec(() => cli.action.stop())
+            .exec(() => removeSync(state.cache))
+            .exec(() => this.warn("The latest version has been installed."))
+            .exec(async () => await this.confirmRestart(flags));
+    }
+
+    private hasRestartFlag(flags: CommandFlags): boolean {
+        return hasSomeProperty(flags, ["restart", "restartCore", "restartRelay", "restartForger"]);
+    }
+
+    private async confirmRestart(flags: CommandFlags): Promise<void> {
         if (this.hasRestartFlag(flags)) {
             if (flags.restart) {
                 this.restartRunningProcessPrompt(`${flags.token}-core`, false);
@@ -102,8 +137,4 @@ export class UpdateCommand extends BaseCommand {
             await this.restartRunningProcessPrompt(`${flags.token}-forger`);
         }
     }
-
-    private hasRestartFlag(flags: CommandFlags): boolean {
-        return hasSomeProperty(flags, ["restart", "restartCore", "restartRelay", "restartForger"]);
-    }
 }

packages/core/src/helpers/config.ts

@@ -33,6 +33,7 @@ class ConfigManager {
             this.write({
                 token: this.config.bin,
                 channel: getRegistryChannel(this.config),
+                updateMethod: "npm",
             });
         }
     }

packages/core/src/helpers/update.ts

@@ -2,7 +2,7 @@ import { IConfig } from "@oclif/config";
 import cli from "cli-ux";
 import { shell } from "execa";
 import { closeSync, openSync, statSync } from "fs";
-import { ensureDirSync, existsSync } from "fs-extra";
+import { ensureDirSync } from "fs-extra";
 import latestVersion from "latest-version";
 import { join } from "path";
 import semver from "semver";
@@ -73,14 +73,6 @@ export const checkForUpdates = async ({ config, error, warn }): Promise<any> =>
         channel: configManager.get("channel"),
     };
 
-    if (existsSync(join(__dirname, "../../../..", ".git"))) {
-        if (!process.env.CORE_DEVELOPER_MODE) {
-            warn(`You are using a git clone for developers. Please install core via yarn for auto-updates.`);
-        }
-
-        return state;
-    }
-
     try {
         const cacheFile = ensureCacheFile(config);
 

yarn.lock

@@ -12116,6 +12116,13 @@ signale@^1.4.0:
     figures "^2.0.0"
     pkg-conf "^2.1.0"
 
+simple-git@^1.113.0:
+  version "1.113.0"
+  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.113.0.tgz#668989728a1e9cf4ec6c72b69ea2eecc93489bea"
+  integrity sha512-i9WVsrK2u0G/cASI9nh7voxOk9mhanWY9eGtWBDSYql6m49Yk5/Fan6uZsDr/xmzv8n+eQ8ahKCoEr8cvU3h+g==
+  dependencies:
+    debug "^4.0.1"
+
 simple-git@^1.85.0:
   version "1.110.0"
   resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.110.0.tgz#54eb179089d055a7783d32399246cebc9d9933e9"