Merge pull request #65 from rads/shared-template-files

Add `deps-template`
kit-clj · Sep 15, 2022 · 9a38fbd · 9a38fbd
2 parents fa0bd89 + b690c56
commit 9a38fbd
Show file tree

Hide file tree

Showing 36 changed files with 23 additions and 9 deletions.
diff --git a/build.clj b/build.clj
@@ -8,7 +8,7 @@
    [deps-deploy.deps-deploy :as deploy]))
 
 (def libs-dir "libs")
-(def versions (read-string (slurp "./libs/lein-template/resources/versions.edn")))
+(def versions (read-string (slurp "./libs/deps-template/resources/io/github/kit_clj/kit/versions.edn")))
 (def group-id "io.github.kit-clj")
 (def src ["src"])
 (def basis (b/create-basis {:project "deps.edn"}))

diff --git a/libs/deps-template/deps.edn b/libs/deps-template/deps.edn
@@ -0,0 +1 @@
+{:paths ["resources"]}
diff --git a/...te/resources/leiningen/new/kit/Dockerfile → ...esources/io/github/kit_clj/kit/Dockerfile b/...te/resources/leiningen/new/kit/Dockerfile → ...esources/io/github/kit_clj/kit/Dockerfile
diff --git a/...late/resources/leiningen/new/kit/Makefile → .../resources/io/github/kit_clj/kit/Makefile b/...late/resources/leiningen/new/kit/Makefile → .../resources/io/github/kit_clj/kit/Makefile
diff --git a/...ate/resources/leiningen/new/kit/README.md → ...resources/io/github/kit_clj/kit/README.md b/...ate/resources/leiningen/new/kit/README.md → ...resources/io/github/kit_clj/kit/README.md
diff --git a/...mplate/resources/leiningen/new/kit/bb.edn → ...te/resources/io/github/kit_clj/kit/bb.edn b/...mplate/resources/leiningen/new/kit/bb.edn → ...te/resources/io/github/kit_clj/kit/bb.edn
diff --git a/...ate/resources/leiningen/new/kit/build.clj → ...resources/io/github/kit_clj/kit/build.clj b/...ate/resources/leiningen/new/kit/build.clj → ...resources/io/github/kit_clj/kit/build.clj
diff --git a/...late/resources/leiningen/new/kit/deps.edn → .../resources/io/github/kit_clj/kit/deps.edn b/...late/resources/leiningen/new/kit/deps.edn → .../resources/io/github/kit_clj/kit/deps.edn
diff --git a/...en/new/kit/env/dev/clj/dev_middleware.clj → ...it_clj/kit/env/dev/clj/dev_middleware.clj b/...en/new/kit/env/dev/clj/dev_middleware.clj → ...it_clj/kit/env/dev/clj/dev_middleware.clj
diff --git a/...ces/leiningen/new/kit/env/dev/clj/env.clj → ...io/github/kit_clj/kit/env/dev/clj/env.clj b/...ces/leiningen/new/kit/env/dev/clj/env.clj → ...io/github/kit_clj/kit/env/dev/clj/env.clj
diff --git a/...es/leiningen/new/kit/env/dev/clj/user.clj → ...o/github/kit_clj/kit/env/dev/clj/user.clj b/...es/leiningen/new/kit/env/dev/clj/user.clj → ...o/github/kit_clj/kit/env/dev/clj/user.clj
diff --git a/...gen/new/kit/env/dev/resources/logback.xml → ...kit_clj/kit/env/dev/resources/logback.xml b/...gen/new/kit/env/dev/resources/logback.xml → ...kit_clj/kit/env/dev/resources/logback.xml
diff --git a/...es/leiningen/new/kit/env/prod/clj/env.clj → ...o/github/kit_clj/kit/env/prod/clj/env.clj b/...es/leiningen/new/kit/env/prod/clj/env.clj → ...o/github/kit_clj/kit/env/prod/clj/env.clj
diff --git a/...en/new/kit/env/prod/resources/logback.xml → ...it_clj/kit/env/prod/resources/logback.xml b/...en/new/kit/env/prod/resources/logback.xml → ...it_clj/kit/env/prod/resources/logback.xml
diff --git a/...en/new/kit/env/test/resources/logback.xml → ...it_clj/kit/env/test/resources/logback.xml b/...en/new/kit/env/test/resources/logback.xml → ...it_clj/kit/env/test/resources/logback.xml
diff --git a/...ate/resources/leiningen/new/kit/gitignore → ...resources/io/github/kit_clj/kit/gitignore b/...ate/resources/leiningen/new/kit/gitignore → ...resources/io/github/kit_clj/kit/gitignore
diff --git a/...plate/resources/leiningen/new/kit/kit.edn → ...e/resources/io/github/kit_clj/kit/kit.edn b/...plate/resources/leiningen/new/kit/kit.edn → ...e/resources/io/github/kit_clj/kit/kit.edn
diff --git a/...rces/leiningen/new/kit/kit.git-config.edn → .../io/github/kit_clj/kit/kit.git-config.edn b/...rces/leiningen/new/kit/kit.git-config.edn → .../io/github/kit_clj/kit/kit.git-config.edn
diff --git a/.../kit/resources/migrations/placeholder.txt → .../kit/resources/migrations/placeholder.txt b/.../kit/resources/migrations/placeholder.txt → .../kit/resources/migrations/placeholder.txt
diff --git a/...s/leiningen/new/kit/resources/queries.sql → .../github/kit_clj/kit/resources/queries.sql b/...s/leiningen/new/kit/resources/queries.sql → .../github/kit_clj/kit/resources/queries.sql
diff --git a/...es/leiningen/new/kit/resources/system.edn → ...o/github/kit_clj/kit/resources/system.edn b/...es/leiningen/new/kit/resources/system.edn → ...o/github/kit_clj/kit/resources/system.edn
diff --git a/...rces/leiningen/new/kit/src/clj/config.clj → .../io/github/kit_clj/kit/src/clj/config.clj b/...rces/leiningen/new/kit/src/clj/config.clj → .../io/github/kit_clj/kit/src/clj/config.clj
diff --git a/...ources/leiningen/new/kit/src/clj/core.clj → ...es/io/github/kit_clj/kit/src/clj/core.clj b/...ources/leiningen/new/kit/src/clj/core.clj → ...es/io/github/kit_clj/kit/src/clj/core.clj
diff --git a/...ew/kit/src/clj/web/controllers/health.clj → ...lj/kit/src/clj/web/controllers/health.clj b/...ew/kit/src/clj/web/controllers/health.clj → ...lj/kit/src/clj/web/controllers/health.clj
diff --git a/...leiningen/new/kit/src/clj/web/handler.clj → ...ithub/kit_clj/kit/src/clj/web/handler.clj b/...leiningen/new/kit/src/clj/web/handler.clj → ...ithub/kit_clj/kit/src/clj/web/handler.clj
diff --git a/...n/new/kit/src/clj/web/middleware/core.clj → ...t_clj/kit/src/clj/web/middleware/core.clj b/...n/new/kit/src/clj/web/middleware/core.clj → ...t_clj/kit/src/clj/web/middleware/core.clj
diff --git a/.../kit/src/clj/web/middleware/exception.clj → .../kit/src/clj/web/middleware/exception.clj b/.../kit/src/clj/web/middleware/exception.clj → .../kit/src/clj/web/middleware/exception.clj
diff --git a/...ew/kit/src/clj/web/middleware/formats.clj → ...lj/kit/src/clj/web/middleware/formats.clj b/...ew/kit/src/clj/web/middleware/formats.clj → ...lj/kit/src/clj/web/middleware/formats.clj
diff --git a/...ningen/new/kit/src/clj/web/routes/api.clj → ...ub/kit_clj/kit/src/clj/web/routes/api.clj b/...ningen/new/kit/src/clj/web/routes/api.clj → ...ub/kit_clj/kit/src/clj/web/routes/api.clj
diff --git a/...ngen/new/kit/src/clj/web/routes/utils.clj → .../kit_clj/kit/src/clj/web/routes/utils.clj b/...ngen/new/kit/src/clj/web/routes/utils.clj → .../kit_clj/kit/src/clj/web/routes/utils.clj
diff --git a/.../leiningen/new/kit/test/clj/core_test.clj → ...github/kit_clj/kit/test/clj/core_test.clj b/.../leiningen/new/kit/test/clj/core_test.clj → ...github/kit_clj/kit/test/clj/core_test.clj
diff --git a/...leiningen/new/kit/test/clj/test_utils.clj → ...ithub/kit_clj/kit/test/clj/test_utils.clj b/...leiningen/new/kit/test/clj/test_utils.clj → ...ithub/kit_clj/kit/test/clj/test_utils.clj
diff --git a/libs/lein-template/resources/versions.edn → ...ources/io/github/kit_clj/kit/versions.edn b/libs/lein-template/resources/versions.edn → ...ources/io/github/kit_clj/kit/versions.edn
@@ -16,4 +16,5 @@
  "kit-sql-conman"   "1.0.3"
  "kit-sql-hikari"   "1.0.1"
  "kit-undertow"     "1.0.2"
- "lein-template"    "0.1.28"}
+ "lein-template"    "0.1.28"
+ "deps-template"    "0.1.28"}
diff --git a/libs/lein-template/deps.edn b/libs/lein-template/deps.edn
@@ -1,3 +1,4 @@
-{:paths   ["src" "resources"]
+{:paths   ["src"]
  :deps    {selmer/selmer                   {:mvn/version "1.12.50"}
-           com.github.seancorfield/clj-new {:mvn/version "1.2.381"}}}
+           com.github.seancorfield/clj-new {:mvn/version "1.2.381"}
+           io.github.kit-clj/deps-template {:mvn/version "0.1.28"}}}
diff --git a/libs/lein-template/src/leiningen/new/io/github/kit_clj.clj b/libs/lein-template/src/leiningen/new/io/github/kit_clj.clj
@@ -26,7 +26,7 @@
     (when (:migratus? data)
       (sql/migrations-files data))))
 
-(def versions (-> (io/resource "versions.edn")
+(def versions (-> (io/resource "io/github/kit_clj/kit/versions.edn")
                   (slurp)
                   (read-string)
                   (walk/keywordize-keys)))

diff --git a/libs/lein-template/src/leiningen/new/io/github/kit_clj/options/helpers.clj b/libs/lein-template/src/leiningen/new/io/github/kit_clj/options/helpers.clj
@@ -1,8 +1,9 @@
 (ns leiningen.new.io.github.kit-clj.options.helpers
   (:require
-    [leiningen.new.templates :refer [renderer sanitize]]
+    [leiningen.new.templates :as templates]
     [clojure.java.io :as io]
-    [selmer.parser :as selmer]))
+    [selmer.parser :as selmer]
+    [clojure.string :as string]))
 
 (def template-name "kit")
 
@@ -13,12 +14,22 @@
     options
     {:tag-open \< :tag-close \> :filter-open \< :filter-close \>}))
 
-(def render-text (renderer template-name selmer-renderer))
+(defn resource-path->template-path [resource-path]
+  (str "io/github/kit_clj/" (templates/sanitize template-name) "/" resource-path))
+
+(defn render-text [template & [data]]
+  (let [path (resource-path->template-path template)]
+    (if-let [resource (io/resource path)]
+      (if data
+        (selmer-renderer (templates/slurp-resource resource) data)
+        (io/reader resource))
+      (throw (ex-info (format "Template resource '%s' not found." path)
+                      {})))))
 
 (defn resource-input
   "Get resource input stream. Useful for binary resources like images."
   [resource-path]
-  (-> (str "leiningen/new/" (sanitize template-name) "/" resource-path)
+  (-> (resource-path->template-path resource-path)
       io/resource
       io/input-stream))