From 97d884232ec969602ec6294d6df944b35e2cd147 Mon Sep 17 00:00:00 2001
From: vitali87 <eheva87@gmail.com>
Date: Fri, 27 Mar 2026 21:54:27 +0100
Subject: [PATCH] feat: add mk env entity for generating .env files from
 templates

---
 lib/completions.sh |  6 ++--
 lib/make.sh        | 31 ++++++++++++++++
 test.sh            | 88 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 123 insertions(+), 2 deletions(-)

diff --git a/lib/completions.sh b/lib/completions.sh
index aa5d9c7..049fe40 100644
--- a/lib/completions.sh
+++ b/lib/completions.sh
@@ -2,10 +2,10 @@ _u7_complete_entities() {
   local verb="$1" cur="$2"
   case "$verb" in
     show|sh)
-      COMPREPLY=($(compgen -W "ip csv json line ssl files diff cpu memory disk processes port usage network git env http docker system definition functions --help" -- "$cur"))
+      COMPREPLY=($(compgen -W "ip csv json line ssl files diff cpu memory disk processes ports port usage network git env http docker system definition functions --help" -- "$cur"))
       ;;
     make|mk)
-      COMPREPLY=($(compgen -W "dir file password user copy link archive clone template sequence --help" -- "$cur"))
+      COMPREPLY=($(compgen -W "dir file password user copy link archive clone template sequence env --help" -- "$cur"))
       ;;
     drop|dr)
       COMPREPLY=($(compgen -W "file dir dirs files line lines column duplicates process user docker --help" -- "$cur"))
@@ -38,12 +38,14 @@ _u7_complete_args() {
         env) COMPREPLY=($(compgen -W "match" -- "$cur")) ;;
         http) COMPREPLY=($(compgen -W "get head headers" -- "$cur")) ;;
         docker) COMPREPLY=($(compgen -W "containers images volumes networks all" -- "$cur")) ;;
+        ports) COMPREPLY=($(compgen -W "match" -- "$cur")) ;;
         *) _filedir ;;
       esac
       ;;
     make|mk)
       case "$entity" in
         copy|link) _filedir ;;
+        env) COMPREPLY=($(compgen -W "from" -- "$cur")) ;;
         template) COMPREPLY=($(compgen -W "python node bash web" -- "$cur")) ;;
       esac
       ;;
diff --git a/lib/make.sh b/lib/make.sh
index c349105..ab30554 100644
--- a/lib/make.sh
+++ b/lib/make.sh
@@ -170,6 +170,36 @@ _u7_make() {
       esac
       ;;
 
+    env)
+      local template=".env.example"
+      local output=".env"
+
+      if [[ "$1" == "from" ]]; then
+        if [[ -z "$2" ]]; then
+          echo "Usage: u7 mk env from <template> [to <output>]"
+          return 1
+        fi
+        template="$2"
+        if [[ "$3" == "to" ]]; then
+          if [[ -z "$4" ]]; then
+            echo "Usage: u7 mk env from <template> to <output>"
+            return 1
+          fi
+          output="$4"
+        fi
+      fi
+
+      if [[ ! -f "$template" ]]; then
+        echo "Error: template '$template' not found"
+        return 1
+      fi
+      if [[ -f "$output" ]]; then
+        echo "Error: '$output' already exists"
+        return 1
+      fi
+      _u7_exec cp "$template" "$output"
+      ;;
+
     sequence)
       if [[ "$1" != "with" || "$2" != "prefix" ]]; then
         echo "Usage: u7 mk sequence with prefix <prefix> limit <N>"
@@ -202,6 +232,7 @@ Entities:
   archive <output> from <files...>         Create archive from <files...> to <output>
   clone <repo> [to <directory>]            Git clone a repository
   template <python|node|bash|web> <name>   Scaffold a project structure
+  env [from <template>] [to <output>]       Generate .env from .env.example or a custom template
   sequence with prefix <prefix> limit <N>  Generate numbered sequence with prefix <prefix> and limit <N>
 EOF
       ;;
diff --git a/test.sh b/test.sh
index d1358ef..2beea56 100755
--- a/test.sh
+++ b/test.sh
@@ -951,6 +951,30 @@ assert_contains "sh system shows uptime" "Uptime:" "$result"
 assert_contains "sh system shows shell" "Shell:" "$result"
 assert_contains "sh system shows user" "User:" "$result"
 
+# Test: sh ports lists listening ports
+result=$(u7 sh ports 2>&1)
+if [[ $? -eq 0 ]]; then
+    echo -e "${GREEN}✓${NC} sh ports runs without error"
+    ((PASSED++))
+else
+    echo -e "${RED}✗${NC} sh ports runs without error"
+    echo "  Got: $result"
+    ((FAILED++))
+fi
+
+# Test: sh ports shows usage on invalid arg
+result=$(u7 sh ports badarg 2>&1)
+assert_contains "sh ports rejects invalid arg" "Usage:" "$result"
+
+# Test: sh ports match requires pattern
+result=$(u7 sh ports match 2>&1)
+assert_contains "sh ports match requires pattern" "Usage:" "$result"
+
+# Test: sh ports match filters output (may return nothing, just check it runs)
+result=$(u7 sh ports match ssh 2>&1)
+echo -e "${GREEN}✓${NC} sh ports match runs without crash"
+((PASSED++))
+
 # Cleanup
 cd /
 rm -rf "$TEST_DIR"
@@ -988,6 +1012,70 @@ else
     ((PASSED++))
 fi
 
+# ===== mk env tests =====
+
+# Test: mk env copies .env.example to .env
+echo "DB_HOST=localhost" > .env.example
+echo "# comment line" >> .env.example
+echo "DB_PORT=5432" >> .env.example
+result=$(u7 mk env 2>&1)
+if [[ -f .env ]]; then
+    content=$(cat .env)
+    expected=$(cat .env.example)
+    assert_equals "mk env copies .env.example to .env" "$expected" "$content"
+else
+    echo -e "${RED}✗${NC} mk env copies .env.example to .env (file not created)"
+    ((FAILED++))
+fi
+rm -f .env
+
+# Test: mk env errors when .env already exists
+echo "existing" > .env
+result=$(u7 mk env 2>&1)
+assert_contains "mk env errors when .env exists" "already exists" "$result"
+rm -f .env .env.example
+
+# Test: mk env errors when .env.example is missing
+result=$(u7 mk env 2>&1)
+assert_contains "mk env errors when template missing" "not found" "$result"
+
+# Test: mk env from <template>
+echo "KEY=value" > custom.template
+result=$(u7 mk env from custom.template 2>&1)
+if [[ -f .env ]]; then
+    content=$(cat .env)
+    assert_equals "mk env from custom template" "KEY=value" "$content"
+else
+    echo -e "${RED}✗${NC} mk env from custom template (file not created)"
+    ((FAILED++))
+fi
+rm -f .env custom.template
+
+# Test: mk env from <template> to <output>
+echo "SECRET=abc" > my.template
+result=$(u7 mk env from my.template to config.env 2>&1)
+if [[ -f config.env ]]; then
+    content=$(cat config.env)
+    assert_equals "mk env from template to output" "SECRET=abc" "$content"
+else
+    echo -e "${RED}✗${NC} mk env from template to output (file not created)"
+    ((FAILED++))
+fi
+rm -f config.env my.template
+
+# Test: mk env dry-run does not create file
+echo "DRY=run" > .env.example
+result=$(u7 -n mk env 2>&1)
+assert_contains "mk env dry-run prints command" "cp" "$result"
+if [[ ! -f .env ]]; then
+    echo -e "${GREEN}✓${NC} mk env dry-run does not create file"
+    ((PASSED++))
+else
+    echo -e "${RED}✗${NC} mk env dry-run does not create file"
+    ((FAILED++))
+fi
+rm -f .env.example
+
 # Cleanup
 cd /
 rm -rf "$TEST_DIR"