Sort the vars in the usage string.

More testing, including when env vars are set.

.env

@@ -0,0 +1,4 @@
+FUN=good
+APPLES=21
+WEIGHT=0.12
+EAT=true

project.clj

@@ -15,10 +15,15 @@
 ;     along with defenv.  If not, see <http://www.gnu.org/licenses/>.
 ;
 
-(defproject coreagile/defenv "0.0.2"
+(defproject coreagile/defenv "0.0.3"
   :description "A simple library for managing environment variables in Clojure"
   :url "https://github.com/coreagile/defenv"
   :license {:name "GNU General Public License v3"
             :url "https://www.gnu.org/licenses/gpl.html"}
   :min-lein-version "2.0.0"
-  :dependencies [[org.clojure/clojure "1.8.0"]])
+  :dependencies [[org.clojure/clojure "1.8.0" :upgrade false]]
+  :profiles {:dev {:plugins [[com.jakemccrary/lein-test-refresh "0.22.0"]
+                             [lein-ancient "0.6.15"]
+                             [lein-bikeshed "0.5.1"]
+                             [lein-dotenv "1.0.0"]
+                             [lein-kibit "0.1.6"]]}})

src/defenv/core.clj

@@ -18,7 +18,7 @@
 (ns defenv.core
   (:require [clojure.string :as str]))
 
-(def defined-env (atom {}))
+(def defined-env (atom (sorted-map)))
 
 (defn- env-or [env-key f]
   (let [val (System/getenv env-key)]
@@ -28,7 +28,7 @@
 
 (defn- render-docs [{:keys [e-name doc default]}]
   (let [e-val (env e-name default)]
-    (format "%s = %s%s" e-name (if e-val e-val "*MISSING*")
+    (format "%s = %s%s" e-name (or e-val "*MISSING*")
             (if doc (str " ;; " doc) ""))))
 
 (defn make-usage-string
@@ -48,14 +48,6 @@
   ([env-key] (env-or env-key throw-usage))
   ([env-key default-value] (env-or env-key #(identity default-value))))
 
-(defn nilsafe-parse-int
-  "Given a String, if nonempty, attempt to parse it as an Integer."
-  [s] (when s (Integer/parseInt s)))
-
-(defn nilsafe-parse-double
-  "Given a String, if nonempty, attempt to parse it as a Double."
-  [s] (when s (Double/parseDouble s)))
-
 (defmacro defenv
   "Define a binding to an environment variable. Creates a delayed object
    that, when dereferenced, will load an environment variable of the given

test-with-checks.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# A script for making sure our code stays clean
+
+check_return_code () {
+  if [ $? -ne 0 ]; then
+    echo $1
+    exit 1
+  fi
+}
+
+lein test 
+check_return_code "lein test failed"
+
+lein ancient :all :no-colors
+check_return_code "lein ancient failed"
+
+lein kibit
+check_return_code "lein kibit failed"
+
+lein bikeshed --var-redefs=false
+check_return_code "lein bikeshed failed"
+
+echo "build successful"
+exit 0

test/defenv/core_test.clj

@@ -20,24 +20,56 @@
             [defenv.core :refer :all])
   (:import (clojure.lang ExceptionInfo)))
 
-(defenv log-level "LOG_LEVEL" :doc "Global log level." :tfn keyword
-        :default "info")
+;;Undefined vars
+(defenv log-level "LOG_LEVEL" :doc "Global log level."
+        :tfn keyword :default "info")
+(defenv should-log "SHOULD_LOG" :doc "Should I log? A boolean."
+        :tfn Boolean/parseBoolean :default "false")
+
+;; Testing we can remove the previous definition from the docstring
 (defenv thing "THING" :default "go away")
 (defenv thing "THING")
-(defenv amount "AMOUNT" :doc "An amount. A double." :tfn nilsafe-parse-double
-        :default "1.5")
+
+(defenv amount "AMOUNT" :doc "An amount. A double."
+        :tfn Double/parseDouble :default "1.5")
+(defenv acount "COUNT" :doc "A count. An int."
+        :tfn Integer/parseInt :default "5")
 (defenv another "ANOTHER" :doc "This is really important!")
 
+;;Vars defined in .env
+(defenv fun "FUN")
+(defenv apples "APPLES" :tfn Integer/parseInt :default "10")
+(defenv weight "WEIGHT" :tfn Float/parseFloat)
+(defenv eat "EAT" :tfn Boolean/parseBoolean :default "false"
+        :doc "Should we eat?")
+
 (def expected-message
   (str "One or more environment variables is missing:\n"
+       "AMOUNT = 1.5 ;; An amount. A double.\n"
+       "ANOTHER = *MISSING* ;; This is really important!\n"
+       "APPLES = 21\n"
+       "COUNT = 5 ;; A count. An int.\n"
+       "EAT = true ;; Should we eat?\n"
+       "FUN = good\n"
        "LOG_LEVEL = info ;; Global log level.\n"
+       "SHOULD_LOG = false ;; Should I log? A boolean.\n"
        "THING = *MISSING*\n"
-       "AMOUNT = 1.5 ;; An amount. A double.\n"
-       "ANOTHER = *MISSING* ;; This is really important!"))
+       "WEIGHT = 0.12"))
 
 (deftest usage
-  (is (= expected-message (make-usage-string)))
-  (is (= 1.5 @amount))
-  (is (thrown? ExceptionInfo @thing))
-  (is (= expected-message
-         (try @thing (catch ExceptionInfo e (.getMessage e))))))
+  (testing "message construction"
+    (is (= expected-message (make-usage-string))))
+
+  (testing "exception throwing"
+    (is (thrown? ExceptionInfo @thing))
+    (is (= expected-message
+           (try @thing (catch ExceptionInfo e (.getMessage e))))))
+
+  (testing "value extraction"
+    (is (= 1.5 @amount))
+    (is (= 5 @acount))
+    (is (not @should-log))
+    (is (= "good" @fun))
+    (is (= 21 @apples))
+    (is (= (float 0.12) @weight))
+    (is @eat)))