re-fix deftask option parsing bug that wasn't really fixed

Author: micha

boot/core/src/boot/cli.clj

@@ -133,6 +133,14 @@
   (let [cli-args (mapv (partial apply argspec->cli-argspec) argspecs)]
     (:summary (cli/parse-opts [] cli-args))))
 
+(defn split-args [args]
+  (loop [kw {} cli [] [arg & more] args]
+    (if-not arg
+      {:kw kw :cli cli}
+      (if-not (keyword? arg)
+        (recur kw (conj cli arg) more)
+        (recur (assoc kw arg (first more)) cli (rest more))))))
+
 (defmacro clifn [doc argspecs & body]
   (assert (string? doc) "missing docstring")
   (let [doc      (string/replace doc #"\n  " "\n")
@@ -146,10 +154,10 @@
         varmeta  {:doc clj-doc :arglists arglists :argspec cli-args}]
     `(->
        (fn [& args#]
-         (let [cli?#     (every? string? args#)
-               parsed#   (when cli?# (cli/parse-opts args# ~cli-args))
-               ~bindings (if-not cli?# args# (:options parsed#))
-               ~'*args*  (when cli?# (:arguments parsed#))]
+         (let [{kws# :kw clis# :cli} (split-args args#)
+               parsed#   (cli/parse-opts clis# ~cli-args)
+               ~bindings (merge kws# (:options parsed#))
+               ~'*args*  (:arguments parsed#)]
            ~@(mapv (partial apply argspec->assert) argspecs)
            (if-not ~'help (do ~@body) (print ~cli-doc))))
        (with-meta ~varmeta))))

boot/core/src/boot/core.clj

@@ -261,11 +261,10 @@
         (when-not (and op (:boot.core/task (meta op)))
           (throw (IllegalArgumentException. (format "No such task (%s)" op-str))))
         (let [spec   (:argspec (meta op))
-              parsed (cli/parse-opts args spec :in-order true)
-              opts   (->> parsed :options (mapcat identity))]
+              parsed (cli/parse-opts args spec :in-order true)]
           (when (seq (:errors parsed))
             (throw (IllegalArgumentException. (string/join "\n" (:errors parsed)))))
-          (recur (conj ret (apply (var-get op) opts)) (:arguments parsed)))))))
+          (recur (conj ret (apply (var-get op) args)) (:arguments parsed)))))))
 
 (def ^:dynamic *warnings* nil)