add a parser to the arg specs

mccraigmccraig · mccraigmccraig · commit 02b1cc34bd55 · 2013-05-13T12:42:03.000+01:00
diff --git a/src/drift/args.clj b/src/drift/args.clj
@@ -10,10 +10,10 @@
   "given a matched option and whatever is after it in the arg list, remove the option
    and return [{opt-key opt-value} remaining-args]"
   [[switch val & rest :as args] spec]
-  (if (and switch val)
-    [{(:key spec) val} rest]
-    [{} args]))
-
+  (let [parser (or (:parser spec) identity)]
+    (if (and switch val)
+      [{(:key spec) (parser val)} rest]
+      [{} args])))
 
 (defn parse-args
   "do a partial parse of args... removing only options we know about and leaving everything else to
@@ -31,15 +31,17 @@
   [{:key :version
     :matcher #{"-v" "-version" "--version"}}
    {:key :config
-    :matcher #{"-c" "-config" "--config"}}])
+    :matcher #{"-c" "-config" "--config"}
+    :parser symbol}])
 
 (defn parse-migrate-args
   [args]
   (parse-args args migrate-arg-specs))
 
 (def create-migration-arg-specs
   [{:key :config
-    :matcher #{"-c" "-config" "--config"}}])
+    :matcher #{"-c" "-config" "--config"}
+    :parser symbol}])
 
 (defn parse-create-migration-args
   [args]
diff --git a/test/drift/test_args.clj b/test/drift/test_args.clj
@@ -26,8 +26,8 @@
 
 (deftest test-parse-migrate-args
   (is (= (parse-migrate-args ["foo" "--other" "blah" "-v" "10" "bar" "--config" "conf" "baz"])
-         [{:version "10" :config "conf"} ["foo" "--other" "blah" "bar" "baz"]])))
+         [{:version "10" :config 'conf} ["foo" "--other" "blah" "bar" "baz"]])))
 
 (deftest test-parse-create-migration-args
   (is (= (parse-create-migration-args ["foo" "--other" "blah" "-v" "10" "bar" "--config" "conf" "baz"])
-         [{:config "conf"} ["foo" "--other" "blah" "-v" "10" "bar" "baz"]])))
+         [{:config 'conf} ["foo" "--other" "blah" "-v" "10" "bar" "baz"]])))
