From 0d611e447c08e440127189d84df5e0e5f48bce7e Mon Sep 17 00:00:00 2001
From: Daniele Scasciafratte <mte90net@gmail.com>
Date: Wed, 10 Jul 2024 11:06:09 +0200
Subject: [PATCH] feat(review): moved shell to env

---
 src/std/{shell.ab => env.ab}           | 20 ++++++++++++++++++++
 src/std/misc.ab                        | 20 --------------------
 src/tests/stdlib/get_env_var.ab        |  2 +-
 src/tests/stdlib/load_env_file.ab      |  2 +-
 src/tests/stdlib/shell_constant_get.ab |  2 +-
 src/tests/stdlib/shell_constant_set.ab |  2 +-
 src/tests/stdlib/shell_isset.ab        |  2 +-
 src/tests/stdlib/shell_unset.ab        |  2 +-
 src/tests/stdlib/shell_var_get.ab      |  2 +-
 src/tests/stdlib/shell_var_set.ab      |  2 +-
 10 files changed, 28 insertions(+), 28 deletions(-)
 rename src/std/{shell.ab => env.ab} (75%)
 delete mode 100644 src/std/misc.ab

diff --git a/src/std/shell.ab b/src/std/env.ab
similarity index 75%
rename from src/std/shell.ab
rename to src/std/env.ab
index 6a65a991..f4f081bf 100644
--- a/src/std/shell.ab
+++ b/src/std/env.ab
@@ -1,3 +1,23 @@
+import * from "std/fs"
+
+pub fun get_env_var(var: Text): Text {
+    let _var = unsafe $echo "\$\{!var}"$
+    if _var != "" {
+        return _var
+    }
+
+    if file_exist(".env") {
+        unsafe $source ".env"$
+        return unsafe $echo "\$\{!var}"$
+    }
+
+    return ""
+}
+
+pub fun load_env_file(): Null {
+    unsafe $export "\$(xargs < .env)" > /dev/null$
+}
+
 pub fun shell_isset(name: Text): Bool {
     $[[ ! -z \$\{!{nameof name}+z} ]]$ failed {
         return false
diff --git a/src/std/misc.ab b/src/std/misc.ab
deleted file mode 100644
index 5a420db2..00000000
--- a/src/std/misc.ab
+++ /dev/null
@@ -1,20 +0,0 @@
-import * from "std/fs"
-
-pub fun get_env_var(var: Text): Text {
-    let _var = unsafe $echo "\$\{!var}"$
-    if _var != "" {
-        return _var
-    }
-
-    if file_exist(".env") {
-        unsafe $source ".env"$
-        return unsafe $echo "\$\{!var}"$
-    }
-
-    return ""
-}
-
-pub fun load_env_file(): Null {
-    unsafe $export "\$(xargs < .env)" > /dev/null$
-}
-
diff --git a/src/tests/stdlib/get_env_var.ab b/src/tests/stdlib/get_env_var.ab
index 09c34e3c..31a6ddb2 100644
--- a/src/tests/stdlib/get_env_var.ab
+++ b/src/tests/stdlib/get_env_var.ab
@@ -1,4 +1,4 @@
-import { get_env_var } from "std/misc"
+import { get_env_var } from "std/env"
 import { file_write } from "std/fs"
 main {
     let path = unsafe $mktemp -d /tmp/amber-XXXX$
diff --git a/src/tests/stdlib/load_env_file.ab b/src/tests/stdlib/load_env_file.ab
index 0a4a33a5..fb636d5c 100644
--- a/src/tests/stdlib/load_env_file.ab
+++ b/src/tests/stdlib/load_env_file.ab
@@ -1,4 +1,4 @@
-import { load_env_file, get_env_var } from "std/misc"
+import { load_env_file, get_env_var } from "std/env"
 import { file_write } from "std/fs"
 main {
     let path = unsafe $mktemp -d /tmp/amber-XXXX$
diff --git a/src/tests/stdlib/shell_constant_get.ab b/src/tests/stdlib/shell_constant_get.ab
index 3cf7f35d..ba9628ea 100644
--- a/src/tests/stdlib/shell_constant_get.ab
+++ b/src/tests/stdlib/shell_constant_get.ab
@@ -1,4 +1,4 @@
-import * from "std/shell"
+import * from "std/env"
 main {
     unsafe shell_constant_set("test_shell_constant_get", "Hello Amber!")
     unsafe $echo "\$test_shell_constant_get"$
diff --git a/src/tests/stdlib/shell_constant_set.ab b/src/tests/stdlib/shell_constant_set.ab
index 1aea1866..f1a140a8 100644
--- a/src/tests/stdlib/shell_constant_set.ab
+++ b/src/tests/stdlib/shell_constant_set.ab
@@ -1,4 +1,4 @@
-import * from "std/shell"
+import * from "std/env"
 main {
     unsafe shell_constant_set("test_shell_constant_set", "Hello Amber")
     let str = ""
diff --git a/src/tests/stdlib/shell_isset.ab b/src/tests/stdlib/shell_isset.ab
index 60e1a0ca..4adf76d2 100644
--- a/src/tests/stdlib/shell_isset.ab
+++ b/src/tests/stdlib/shell_isset.ab
@@ -1,4 +1,4 @@
-import * from "std/shell"
+import * from "std/env"
 main {
     unsafe $test_var_isset="test"$
     if shell_isset("test_var_isset") {
diff --git a/src/tests/stdlib/shell_unset.ab b/src/tests/stdlib/shell_unset.ab
index 47a8fd42..cfd4cb76 100644
--- a/src/tests/stdlib/shell_unset.ab
+++ b/src/tests/stdlib/shell_unset.ab
@@ -1,4 +1,4 @@
-import * from "std/shell"
+import * from "std/env"
 main {
     unsafe shell_var_set("test_shell_unset", "Hello Amber!")
     unsafe $echo \$test_shell_unset$
diff --git a/src/tests/stdlib/shell_var_get.ab b/src/tests/stdlib/shell_var_get.ab
index ba3972f0..e9e96e07 100644
--- a/src/tests/stdlib/shell_var_get.ab
+++ b/src/tests/stdlib/shell_var_get.ab
@@ -1,4 +1,4 @@
-import * from "std/shell"
+import * from "std/env"
 main {
     unsafe $export test_shell_var_get="Hello Amber!"$
     echo unsafe shell_var_get("test_shell_var_get")
diff --git a/src/tests/stdlib/shell_var_set.ab b/src/tests/stdlib/shell_var_set.ab
index 5fdb85f4..255e9fa5 100644
--- a/src/tests/stdlib/shell_var_set.ab
+++ b/src/tests/stdlib/shell_var_set.ab
@@ -1,4 +1,4 @@
-import * from "std/shell"
+import * from "std/env"
 main {
     unsafe shell_var_set("test_shell_var_set", "Hello Amber!")
     unsafe $echo \$test_shell_var_set$