config, storage: from-env for overriding settings via env-data

config.lisp

@@ -5,7 +5,7 @@
 (defpackage :scopes/config
   (:use :common-lisp)
   (:export #:base #:root #:*root* #:*current*
-           #:env-data #:env-keys #:env-prefix #:env-path 
+           #:env-data #:env-keys #:env-prefix #:env-path #:from-env
            #:actions #:add #:add-action #:children #:env-slots 
            #:name #:setup #:parent #:shutdown))
 
@@ -89,6 +89,9 @@
 
 ;;;; utility functions
 
+(defun from-env (key default)
+  (or (gethash key (env-data *root*)) default))
+
 (defun hash-to-slots (ht obj slots)
   (if ht
     (dolist (sl slots)

test/config-postgres.lisp

@@ -3,11 +3,14 @@
 
 (in-package :scopes/test-storage)
 
-(defvar postgres-connect-args
+(config:root :env-keys '(:db-name :db-user :db-password))
-  '(:database-name "cltest" :host "localhost" :port 5432
-    :username "testuser" :password "secret"))
 
-(config:root :env-keys '(db-name db-user db-password))
+(defvar postgres-connect-args
+  (list :database-name (config:from-env :db-name "cltest")
+        :host "localhost" 
+        :port 5432
+        :username (config:from-env :db-user "testuser")
+        :password (config:from-env :db-password "secret")))
 
 (config:add :storage :class 'storage:config :setup #'storage:setup
             :db-type :postgres

test/config-sqlite.lisp

@@ -3,10 +3,12 @@
 
 (in-package :scopes/test-storage)
 
-(defvar sqlite-connect-args
+(config:root :env-keys '(:db-name))
-  (list :database-name (namestring (scopes/testing:test-path "test.db" "data"))))
 
-(config:root :env-keys '(db-name))
+(defvar sqlite-connect-args
+  (list :database-name 
+        (namestring 
+          (scopes/testing:test-path (config:from-env :db-name "test.db") "data"))))
 
 (config:add :storage :class 'storage:config :setup #'storage:setup
             :db-type :sqlite3