From 8f1d6ea125820304fbfee80a162358a91afb77ba Mon Sep 17 00:00:00 2001
From: thomsj <thomsj@users.noreply.github.com>
Date: Thu, 10 Oct 2019 05:49:09 +0100
Subject: [PATCH] Add missing log level to `env` output for Fish shell (#150)

Refactor and add new type, used by records for POSIX and fish, to ensure
parity between shells.
---
 executable/Env.re | 95 +++++++++++++++++++++++++++++++----------------
 1 file changed, 63 insertions(+), 32 deletions(-)

diff --git a/executable/Env.re b/executable/Env.re
index 4196abc..6881331 100644
--- a/executable/Env.re
+++ b/executable/Env.re
@@ -1,5 +1,55 @@
 open Fnm;
 
+module ExportShellVarCmdGetters = {
+  type exportCmdGetter = {
+    getPathCmd: string => string,
+    getMultiShellPathCmd: string => string,
+    getFnmDirCmd: string => string,
+    getNodeDistMirrorCmd: string => string,
+    getLogLevelCmd: string => string,
+  };
+
+  let posixExportCmdGetter: exportCmdGetter = {
+    getPathCmd: path => Printf.sprintf("export PATH=%s/bin:$PATH", path),
+
+    getMultiShellPathCmd: path =>
+      Printf.sprintf("export %s=%s", Config.FNM_MULTISHELL_PATH.name, path),
+
+    getFnmDirCmd: fnmDir =>
+      Printf.sprintf("export %s=%s", Config.FNM_DIR.name, fnmDir),
+
+    getNodeDistMirrorCmd: nodeDistMirror =>
+      Printf.sprintf(
+        "export %s=%s",
+        Config.FNM_NODE_DIST_MIRROR.name,
+        nodeDistMirror,
+      ),
+
+    getLogLevelCmd: logLevel =>
+      Printf.sprintf("export %s=%s", Config.FNM_LOGLEVEL.name, logLevel),
+  };
+
+  let fishExportCmdGetter: exportCmdGetter = {
+    getPathCmd: path => Printf.sprintf("set -gx PATH %s/bin $PATH;", path),
+
+    getMultiShellPathCmd: path =>
+      Printf.sprintf("set -gx %s %s;", Config.FNM_MULTISHELL_PATH.name, path),
+
+    getFnmDirCmd: fnmDir =>
+      Printf.sprintf("set -gx %s %s;", Config.FNM_DIR.name, fnmDir),
+
+    getNodeDistMirrorCmd: nodeDistMirror =>
+      Printf.sprintf(
+        "set -gx %s %s",
+        Config.FNM_NODE_DIST_MIRROR.name,
+        nodeDistMirror,
+      ),
+
+    getLogLevelCmd: logLevel =>
+      Printf.sprintf("set -gx %s %s", Config.FNM_LOGLEVEL.name, logLevel),
+  };
+};
+
 let symlinkExists = path =>
   try%lwt(Lwt_unix.lstat(path) |> Lwt.map(_ => true)) {
   | _ => Lwt.return(false)
@@ -90,38 +140,19 @@ let run =
     multishell
       ? makeTemporarySymlink() : Lwt.return(Directories.globalCurrentVersion);
 
-  switch (shell) {
-  | Bash
-  | Zsh =>
-    Printf.sprintf("export PATH=%s/bin:$PATH", path) |> Console.log;
-    Printf.sprintf("export %s=%s", Config.FNM_MULTISHELL_PATH.name, path)
-    |> Console.log;
-    Printf.sprintf("export %s=%s", Config.FNM_DIR.name, fnmDir) |> Console.log;
-    Printf.sprintf(
-      "export %s=%s",
-      Config.FNM_NODE_DIST_MIRROR.name,
-      nodeDistMirror,
-    )
-    |> Console.log;
-    Printf.sprintf(
-      "export %s=%s",
-      Config.FNM_LOGLEVEL.name,
-      Fnm.LogLevel.toString(logLevel),
-    )
-    |> Console.log;
-  | Fish =>
-    Printf.sprintf("set -gx PATH %s/bin $PATH;", path) |> Console.log;
-    Printf.sprintf("set -gx %s %s;", Config.FNM_MULTISHELL_PATH.name, path)
-    |> Console.log;
-    Printf.sprintf("set -gx %s %s;", Config.FNM_DIR.name, fnmDir)
-    |> Console.log;
-    Printf.sprintf(
-      "set -gx %s %s",
-      Config.FNM_NODE_DIST_MIRROR.name,
-      nodeDistMirror,
-    )
-    |> Console.log;
-  };
+  let exportCmdGetter =
+    shell === Fish
+      ? ExportShellVarCmdGetters.fishExportCmdGetter
+      : ExportShellVarCmdGetters.posixExportCmdGetter;
+
+  exportCmdGetter.getPathCmd(path) |> Console.log;
+  exportCmdGetter.getMultiShellPathCmd(path) |> Console.log;
+  exportCmdGetter.getFnmDirCmd(fnmDir) |> Console.log;
+  exportCmdGetter.getNodeDistMirrorCmd(nodeDistMirror) |> Console.log;
+
+  Fnm.LogLevel.toString(logLevel)
+  |> exportCmdGetter.getLogLevelCmd
+  |> Console.log;
 
   if (useOnCd) {
     printUseOnCd(~shell) |> Console.log;