cli

.envrc

@@ -6,4 +6,4 @@ set -euo pipefail
 # External users should use `source_url` to load this file
 source_env ./direnvrc
 
-use devenv
+use devenv

.github/workflows/buildtest.yml

@@ -67,12 +67,12 @@ jobs:
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
     - run: |
         nix profile remove '.*'
-        nix profile install --accept-flake-config . "nixpkgs#gawk"
+        nix profile install --accept-flake-config .
     - name: Disable package aliases 
       run: |
         mkdir -p ~/.config/nixpkgs
         echo '{ allowAliases = false; }' > ~/.config/nixpkgs/config.nix
-    - run: devenv shell devenv-test-example ${{ matrix.example }}
+    - run: devenv test ${{ matrix.example }}
   direnv:
     name: direnv (${{ join(matrix.os) }})
     needs: build
@@ -92,15 +92,15 @@ jobs:
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
     - run: |
         mv ./examples/simple/devenv.yaml ./examples/simple/devenv.yaml.orig
-        awk '
+        nix run nixpkgs#gawk -- '
           { print }
           /^inputs:$/ {
             print "  devenv:";
             print "    url: path:../../src/modules";
           }
         ' ./examples/simple/devenv.yaml.orig > ./examples/simple/devenv.yaml
         nix profile remove '.*'
-        nix profile install . 'nixpkgs#direnv' nix profile install --accept-flake-config
+        nix profile install . 'nixpkgs#direnv' 
         mkdir -p ~/.config/direnv/
         cat > ~/.config/direnv/direnv.toml << 'EOF'
         [global]

devenv.nix

@@ -1,9 +1,7 @@
 { inputs, pkgs, lib, config, ... }:
 
 {
-  env = {
-    DEVENV_NIX = inputs.nix.packages.${pkgs.stdenv.system}.nix;
-  };
+  env.DEVENV_NIX = inputs.nix.packages.${pkgs.stdenv.system}.nix;
 
   packages = [
     pkgs.cairo
@@ -82,43 +80,6 @@
     popd
     rm -rf "$tmp"
   '';
-  scripts.devenv-test-all-examples.exec = ''
-    for dir in $(ls examples); do
-      devenv-test-example $dir
-    done
-  '';
-  scripts.devenv-test-example.exec = ''
-    # execute all trap_ function on exit
-    trap 'eval $(declare -F | grep -o "trap_[^ ]*" | tr "\n" ";")' EXIT
-
-    set -e
-    example="$PWD/examples/$1"
-    pushd $example
-    mv devenv.yaml devenv.yaml.orig
-    awk '
-      { print }
-      /^inputs:$/ {
-        print "  devenv:";
-        print "    url: path:../../src/modules";
-      }
-    ' devenv.yaml.orig > devenv.yaml
-    trap_restore_yaml() { 
-      mv "$example/devenv.yaml.orig" "$example/devenv.yaml"
-    }
-    devenv ci
-    if [ -f .test.sh ]; then
-      trap_restore_local() { 
-        rm "$example/devenv.local.nix" 
-        rm -rf "$example/.devenv"
-      }
-      # coreutils-full provides timeout on darwin
-      echo "{ pkgs, ... }: { packages = [ pkgs.coreutils-full ]; }" > devenv.local.nix
-      devenv shell ./.test.sh
-    else
-      devenv shell ls
-    fi
-    popd
-  '';
   scripts."devenv-generate-doc-options".exec = ''
     set -e
     options=$(nix build --impure --extra-experimental-features 'flakes nix-command' --show-trace --print-out-paths --no-link '.#devenv-docs-options')
@@ -162,4 +123,6 @@
     MD033 = false;
     MD034 = false;
   };
+
+  tests = config.lib.mkTests [ "devenv" ] ./examples;
 }

examples/clickhouse/.test.sh

@@ -1,6 +1,2 @@
-#!/bin/sh
-set -ex
-pkill clickhouse
-devenv up&
 timeout 20 bash -c 'until echo > /dev/tcp/localhost/9000; do sleep 0.5; done'
-clickhouse-client --query "SELECT 1"
+clickhouse-client --query "SELECT 1"

examples/mailpit/.test.sh

@@ -1,10 +1,6 @@
 #!/bin/sh
 set -ex
 
-devenv up &
-DEVENV_PID=$!
-trap "pkill -P $DEVENV_PID" EXIT
-
 timeout 20 bash -c 'until echo > /dev/tcp/localhost/1025; do sleep 0.5; done'
 
 sendmail john@example.com <<EOF

examples/minio/.test.sh

@@ -1,10 +1,5 @@
 #!/bin/sh
 set -ex
 
-devenv up &
-DEVENV_PID=$!
-trap "pkill -P $DEVENV_PID" EXIT
-
 timeout 20 bash -c 'until echo > /dev/tcp/localhost/9000; do sleep 0.5; done'
-
-mc admin info local
+mc admin info local

examples/mysql/.test.sh

@@ -1,8 +1,3 @@
-#!/bin/sh
 set -ex
 
-devenv up &
-DEVENV_PID=$!
-trap "pkill -P $DEVENV_PID" EXIT
-
-timeout 60 bash -c 'until MYSQL_PWD="" mysql -u root test_database < /dev/null; do sleep 0.5; done'
+timeout 60 bash -c 'until MYSQL_PWD="" mysql -u root test_database < /dev/null; do sleep 0.5; done'

examples/postgres/.test.sh

@@ -1,6 +1,2 @@
-#!/bin/sh
 set -ex
-
-devenv up &
-
 timeout 20 bash -c 'until psql -h /tmp -c "SELECT 1" mydb 2>/dev/null; do sleep 0.5; done'

examples/rubyonrails/.test.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 set -ex
 rails new blog -d=postgresql
-devenv up&
 timeout 20 bash -c 'until echo > /dev/tcp/localhost/5100; do sleep 0.5; done'
 (cd blog && rails db:create)
 curl -s http://localhost:5100/ | grep "version"

examples/rust/.test.sh

@@ -1,4 +1,3 @@
-#!/bin/sh
 set -ex
 cargo --version
 rustc --version

examples/temporal/.test.sh

@@ -1,11 +1,6 @@
 #!/bin/sh
 set -x
 
-# Start the services in the background and store the PID
-echo "Starting temporal service..."
-devenv up &
-DEVENV_PID=$!
-
 export TEMPORAL_ADDRESS=127.0.0.1:17233
 
 # temporal status and store its exit status
@@ -34,9 +29,5 @@ echo "Startup complete..."
 temporal operator cluster system
 echo "$TEMPORAL_OUTPUT"
 
-# Clean up by terminating all spawned processes
-pkill -P $DEVENV_PID
-wait $DEVENV_PID&>/dev/null
-
 # Exit the script
-exit $TEMPORAL_EXIT_STATUS
+exit $TEMPORAL_EXIT_STATUS

examples/vault/.test.sh

@@ -1,11 +1,6 @@
 #!/bin/sh
 set -x
 
-# Start the services in the background and store the PID
-echo "Starting vault service..."
-devenv up&
-DEVENV_PID=$!
-
 # vault status and store its exit status
 check_vault_status() {
   echo "Waiting for service to become available..."
@@ -29,9 +24,5 @@ echo "Startup complete..."
 vault version
 echo "$VAULT_OUTPUT"
 
-# Clean up by terminating all spawned processes
-pkill -P $DEVENV_PID
-wait $DEVENV_PID &> /dev/null
-
 # Exit the script
 exit $VAULT_EXIT_STATUS