feat: Load env file with the environ

Signed-off-by: Vincent Boutour <[email protected]>

Author: ViBiOh

sublime/plugins/SublimeGo/env_loader.py

@@ -9,41 +9,44 @@
 env_regex = re.compile("^(export )?([a-zA-Z_][a-zA-Z0-9_]*)=(.*)")
 
 
-def load_env(cwd, name):
+def load_env_file(cwd, name):
     env_file = join(cwd, name)
 
-    if exists(env_file):
-        try:
-            env_values = subprocess.check_output(
-                [
-                    "sh",
-                    "--norc",
-                    "-c",
-                    "source '{}' && declare".format(env_file),
-                ],
-                stderr=subprocess.STDOUT,
-                cwd=cwd,
-            )
-        except subprocess.CalledProcessError as e:
-            print("unable to source .env: {}".format(e.output.decode("utf8")))
-            return None
-
-        env = {}
-        for line in env_values.decode("utf8").rstrip().split("\n"):
-            if env_regex.match(line):
-                parts = env_regex.findall(line)
-                env[parts[0][1]] = parts[0][2]
+    if not exists(env_file):
+        return {}
 
-        return env
+    try:
+        env_values = subprocess.check_output(
+            [
+                "bash",
+                "-c",
+                "set -o pipefail -o errexit; comm -13 <(declare) <(source '{}' && declare)".format(
+                    env_file
+                ),
+            ],
+            stderr=subprocess.STDOUT,
+        )
+    except subprocess.CalledProcessError as e:
+        print("unable to source .env: {}".format(e.output.decode("utf8")))
+        return None
+
+    env = {}
 
-    return None
+    for line in env_values.decode("utf8").rstrip().split("\n"):
+        if env_regex.match(line):
+            parts = env_regex.findall(line)
+            env[parts[0][1]] = parts[0][2]
+
+    return env
 
 
 def load_git_root_env(cwd):
+    env = dict(os.environ)
+
     is_git = subprocess.call(["git", "rev-parse", "--is-inside-work-tree"], cwd=cwd)
     if is_git != 0:
         print("not in git")
-        return None
+        return env
 
     try:
         git_root = subprocess.check_output(
@@ -53,8 +56,12 @@ def load_git_root_env(cwd):
         )
     except subprocess.CalledProcessError as e:
         print("unable to get root path: {}".format(e.output.decode("utf8")))
-        return None
+        return env
 
     root = git_root.decode("utf8").rstrip()
 
-    return load_env(root, ".env")
+    dot_env = load_env_file(root, ".env")
+    if dot_env:
+        env.update(dot_env)
+
+    return env

sublime/plugins/SublimeGo/test.py

@@ -3,6 +3,7 @@
 import threading
 from .async_task import AsyncTask
 from .env_loader import load_git_root_env
+import os
 
 
 class GoTest(sublime_plugin.WindowCommand):
@@ -35,10 +36,6 @@ def run(self, kill=False):
         settings.set("result_base_dir", working_dir)
         window.run_command("show_panel", {"panel": "output.gotest"})
 
-        env = load_git_root_env(working_dir)
-
-        print(env)
-
         if self.task:
             self.task.kill()
 
@@ -48,7 +45,7 @@ def run(self, kill=False):
             command=["go", "test", "-cover", "-race"],
             output=self.queue_write,
             cwd=working_dir,
-            env=env,
+            env=load_git_root_env(working_dir),
         )
 
     def queue_write(self, text):

sublime/plugins/SublimeGo/test_function.py

@@ -35,8 +35,6 @@ def run(self, kill=False):
         settings.set("result_base_dir", working_dir)
         window.run_command("show_panel", {"panel": "output.gotest"})
 
-        env = load_env(working_dir)
-
         if self.task:
             self.task.kill()
 
@@ -48,7 +46,7 @@ def run(self, kill=False):
             command=["go", "test", "-cover", "-race", "-run", function_name],
             output=self.queue_write,
             cwd=working_dir,
-            env=env,
+            env=load_git_root_env(working_dir),
         )
 
     def queue_write(self, text):