Add unsetenv builtin (closes #140)

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## [master](https://github.com/dundalek/closh/compare/v0.4.0...master) (unreleased)
 
+- Add unsetenv builtin ([#14](https://github.com/dundalek/closh/issues/140))
+
 ### Fixes
 
 - Fix cd which broke with Java 11 ([#144](https://github.com/dundalek/closh/issues/144))

src/common/closh/zero/builtin.cljc

@@ -36,6 +36,11 @@
           (fn [[k v]] (process/setenv k v))
           (partition 2 args))))
 
+(defcmd unsetenv
+  "Unsets environment variables."
+  [& args]
+  (doall (map process/unsetenv args)))
+
 (defcmd cd
   "Changes current working directory to a path of a first given argument."
   [& args]

src/common/closh/zero/env.cljc

@@ -13,7 +13,7 @@
             '[closh.zero.compiler]
             '[closh.zero.parser]
             '[closh.zero.core :refer [shx expand]]
-            '[closh.zero.builtin :refer [cd exit quit getenv setenv]]
+            '[closh.zero.builtin :refer [cd exit quit getenv setenv unsetenv]]
             '[closh.zero.platform.process]
             '[closh.zero.pipeline]
             '[clojure.string :as str]

src/common/closh/zero/util.cljc

@@ -1,6 +1,6 @@
 (ns closh.zero.util
   (:require [clojure.data :refer [diff]]
-            [closh.zero.platform.process :refer [shx setenv getenv]]
+            [closh.zero.platform.process :refer [shx setenv getenv unsetenv]]
             [closh.zero.pipeline :refer [process-value]]
             #?(:clj [clojure.data.json :as json])
             #?@(:cljs [[fs] [tmp]])))
@@ -30,7 +30,7 @@
   (let [var-diff (diff before after)
         removed (remove #(ignore-env-vars (first %)) (first var-diff))
         changed (remove #(ignore-env-vars (first %)) (second var-diff))]
-    (doseq [[k _] removed] (setenv k))
+    (doseq [[k _] removed] (unsetenv k))
     (doseq [[k v] changed] (setenv k v))))
 
 (defn source-shell

src/jvm/closh/zero/platform/process.clj

@@ -37,11 +37,13 @@
       (reset! *cwd* target)
       (throw (Exception. (str target ": Is not a directory"))))))
 
-(defn setenv
-  ([k] (swap! *env* dissoc k))
-  ([k v] (let [val (str v)]
-           (swap! *env* assoc k val)
-           val)))
+(defn setenv [k v]
+  (let [val (str v)]
+    (swap! *env* assoc k val)
+    val))
+
+(defn unsetenv [k]
+  (swap! *env* dissoc k))
 
 (defn getenv
   ([] (merge

src/lumo/closh/zero/platform/process.cljs

@@ -37,10 +37,12 @@
      (apply array (flatten args))
      #js{:stdio (open-io-streams (:redir opts))})))
 
-(defn setenv
-  ([k] (js-delete js/process.env k))
-  ([k v] (do (gobj/set js/process.env k v)
-             v)))
+(defn setenv [k v]
+  (do (gobj/set js/process.env k v)
+      v))
+
+(defn unsetenv [k]
+  (js-delete js/process.env k))
 
 (defn getenv
   ([] (jsx->clj js/process.env))

test/closh/util_test.cljc

@@ -1,6 +1,6 @@
 (ns closh.util-test
   (:require [clojure.test :refer [deftest testing is are run-tests]]
-            [closh.zero.platform.process :refer [getenv setenv shx]]
+            [closh.zero.platform.process :refer [getenv setenv unsetenv shx]]
             [closh.zero.pipeline :refer [pipeline-value]]
             [closh.zero.util :refer [source-shell]]))
 
@@ -25,4 +25,8 @@
                   (getenv "B"))))
 
   (is (= "hello\n" (do (setenv "B" "hello")
-                       (pipeline-value (shx "bash" ["-c" "echo $B"]))))))
+                       (pipeline-value (shx "bash" ["-c" "echo $B"])))))
+
+  (is (= nil (do (setenv "B" "hi")
+                 (unsetenv "B")
+                 (getenv "B")))))