From 8d24f70d7390fb45badde46266f8ebc6801a1f23 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Fri, 29 Jul 2022 12:51:43 +0200
Subject: [PATCH] task integration

---
 src/babashka/impl/cli.clj   |  3 +++
 src/babashka/impl/tasks.clj | 39 +++++++++++++++++++++++++------------
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/babashka/impl/cli.clj b/src/babashka/impl/cli.clj
index 85fe6667..0d199c5d 100644
--- a/src/babashka/impl/cli.clj
+++ b/src/babashka/impl/cli.clj
@@ -16,5 +16,8 @@
 (def var-meta (meta (resolve '%1$s/%2$s)))
 (def cli-opts (babashka.cli/merge-opts (:org.babashka/cli ns-meta) (:org.babashka/cli var-meta)))
 (def opts (babashka.cli/parse-opts *command-line-args* cli-opts))
+(def task-exec-args (:exec-args (babashka.tasks/current-task)))
+(def cli-exec-args (:exec-args cli-opts))
+(def opts (babashka.cli/merge-opts cli-exec-args task-exec-args opts))
 (%1$s/%2$s opts)"
           ns var-name))
diff --git a/src/babashka/impl/tasks.clj b/src/babashka/impl/tasks.clj
index 2c59a4a8..eeb2a08f 100644
--- a/src/babashka/impl/tasks.clj
+++ b/src/babashka/impl/tasks.clj
@@ -1,16 +1,19 @@
 (ns babashka.impl.tasks
-  (:require [babashka.deps :as deps]
-            [babashka.impl.common :refer [ctx bb-edn debug]]
-            [babashka.impl.process :as pp]
-            [babashka.process :as p]
-            [clojure.core.async :refer [<!!]]
-            [clojure.java.io :as io]
-            [clojure.string :as str]
-            [rewrite-clj.node :as node]
-            [rewrite-clj.parser :as parser]
-            [rewrite-clj.zip :as zip]
-            [sci.core :as sci])
-  (:import [clojure.core.async.impl.channels ManyToManyChannel]))
+  (:require
+   [babashka.deps :as deps]
+   [babashka.impl.cli :as cli]
+   [babashka.impl.common :refer [bb-edn ctx debug]]
+   [babashka.impl.process :as pp]
+   [babashka.process :as p]
+   [clojure.core.async :refer [<!!]]
+   [clojure.java.io :as io]
+   [clojure.string :as str]
+   [rewrite-clj.node :as node]
+   [rewrite-clj.parser :as parser]
+   [rewrite-clj.zip :as zip]
+   [sci.core :as sci])
+  (:import
+   [clojure.core.async.impl.channels ManyToManyChannel]))
 
 (defn -chan? [x]
   (instance? ManyToManyChannel x))
@@ -264,6 +267,9 @@
 (when-not (resolve 'run)
   (intern *ns* 'run babashka.tasks/run))
 
+(when-not (resolve 'exec)
+  (intern *ns* (with-meta 'exec {:macro true}) @(var babashka.tasks/exec)))
+
 %s
 %s
 
@@ -451,6 +457,14 @@
    (let [[[expr]] (assemble-task task parallel)]
      (sci/eval-string* @ctx expr))))
 
+(defn ^:macro exec
+  ([_ _ fq-sym]
+   (let [ns (namespace fq-sym)
+         var-name (name fq-sym)
+         snippet (cli/exec-fn-snippet ns var-name)]
+     (prn snippet)
+     `(load-string ~snippet))))
+
 (def tasks-namespace
   {'shell (sci/copy-var shell sci-ns)
    'clojure (sci/copy-var clojure sci-ns)
@@ -461,4 +475,5 @@
    'current-task current-task
    'current-state state
    'run (sci/copy-var run sci-ns)
+   'exec (sci/copy-var exec sci-ns)
    #_#_'log log})