From 71867fcdca7dc1e1467ea7160b88b98f2be1ccb3 Mon Sep 17 00:00:00 2001 From: Radford Smith <11401+rads@users.noreply.github.com> Date: Mon, 15 Aug 2022 15:51:12 -0700 Subject: [PATCH 1/3] Move template files from lein-template to deps-template --- libs/deps-template/deps.edn | 1 + .../resources/io/github/kit_clj}/kit/Dockerfile | 0 .../resources/io/github/kit_clj}/kit/Makefile | 0 .../resources/io/github/kit_clj}/kit/README.md | 0 .../new => deps-template/resources/io/github/kit_clj}/kit/bb.edn | 0 .../resources/io/github/kit_clj}/kit/build.clj | 0 .../resources/io/github/kit_clj}/kit/deps.edn | 0 .../io/github/kit_clj}/kit/env/dev/clj/dev_middleware.clj | 0 .../resources/io/github/kit_clj}/kit/env/dev/clj/env.clj | 0 .../resources/io/github/kit_clj}/kit/env/dev/clj/user.clj | 0 .../io/github/kit_clj}/kit/env/dev/resources/logback.xml | 0 .../resources/io/github/kit_clj}/kit/env/prod/clj/env.clj | 0 .../io/github/kit_clj}/kit/env/prod/resources/logback.xml | 0 .../io/github/kit_clj}/kit/env/test/resources/logback.xml | 0 .../resources/io/github/kit_clj}/kit/gitignore | 0 .../resources/io/github/kit_clj}/kit/kit.edn | 0 .../resources/io/github/kit_clj}/kit/kit.git-config.edn | 0 .../io/github/kit_clj}/kit/resources/migrations/placeholder.txt | 0 .../resources/io/github/kit_clj}/kit/resources/queries.sql | 0 .../resources/io/github/kit_clj}/kit/resources/system.edn | 0 .../resources/io/github/kit_clj}/kit/src/clj/config.clj | 0 .../resources/io/github/kit_clj}/kit/src/clj/core.clj | 0 .../io/github/kit_clj}/kit/src/clj/web/controllers/health.clj | 0 .../resources/io/github/kit_clj}/kit/src/clj/web/handler.clj | 0 .../io/github/kit_clj}/kit/src/clj/web/middleware/core.clj | 0 .../io/github/kit_clj}/kit/src/clj/web/middleware/exception.clj | 0 .../io/github/kit_clj}/kit/src/clj/web/middleware/formats.clj | 0 .../resources/io/github/kit_clj}/kit/src/clj/web/routes/api.clj | 0 .../io/github/kit_clj}/kit/src/clj/web/routes/utils.clj | 0 .../resources/io/github/kit_clj}/kit/test/clj/core_test.clj | 0 .../resources/io/github/kit_clj}/kit/test/clj/test_utils.clj | 0 .../resources/io/github/kit_clj/kit}/versions.edn | 0 32 files changed, 1 insertion(+) create mode 100644 libs/deps-template/deps.edn rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/Dockerfile (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/Makefile (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/README.md (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/bb.edn (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/build.clj (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/deps.edn (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/env/dev/clj/dev_middleware.clj (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/env/dev/clj/env.clj (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/env/dev/clj/user.clj (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/env/dev/resources/logback.xml (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/env/prod/clj/env.clj (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/env/prod/resources/logback.xml (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/env/test/resources/logback.xml (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/gitignore (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/kit.edn (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/kit.git-config.edn (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/resources/migrations/placeholder.txt (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/resources/queries.sql (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/resources/system.edn (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/src/clj/config.clj (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/src/clj/core.clj (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/src/clj/web/controllers/health.clj (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/src/clj/web/handler.clj (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/src/clj/web/middleware/core.clj (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/src/clj/web/middleware/exception.clj (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/src/clj/web/middleware/formats.clj (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/src/clj/web/routes/api.clj (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/src/clj/web/routes/utils.clj (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/test/clj/core_test.clj (100%) rename libs/{lein-template/resources/leiningen/new => deps-template/resources/io/github/kit_clj}/kit/test/clj/test_utils.clj (100%) rename libs/{lein-template/resources => deps-template/resources/io/github/kit_clj/kit}/versions.edn (100%) diff --git a/libs/deps-template/deps.edn b/libs/deps-template/deps.edn new file mode 100644 index 0000000..390175b --- /dev/null +++ b/libs/deps-template/deps.edn @@ -0,0 +1 @@ +{:paths ["resources"]} diff --git a/libs/lein-template/resources/leiningen/new/kit/Dockerfile b/libs/deps-template/resources/io/github/kit_clj/kit/Dockerfile similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/Dockerfile rename to libs/deps-template/resources/io/github/kit_clj/kit/Dockerfile diff --git a/libs/lein-template/resources/leiningen/new/kit/Makefile b/libs/deps-template/resources/io/github/kit_clj/kit/Makefile similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/Makefile rename to libs/deps-template/resources/io/github/kit_clj/kit/Makefile diff --git a/libs/lein-template/resources/leiningen/new/kit/README.md b/libs/deps-template/resources/io/github/kit_clj/kit/README.md similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/README.md rename to libs/deps-template/resources/io/github/kit_clj/kit/README.md diff --git a/libs/lein-template/resources/leiningen/new/kit/bb.edn b/libs/deps-template/resources/io/github/kit_clj/kit/bb.edn similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/bb.edn rename to libs/deps-template/resources/io/github/kit_clj/kit/bb.edn diff --git a/libs/lein-template/resources/leiningen/new/kit/build.clj b/libs/deps-template/resources/io/github/kit_clj/kit/build.clj similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/build.clj rename to libs/deps-template/resources/io/github/kit_clj/kit/build.clj diff --git a/libs/lein-template/resources/leiningen/new/kit/deps.edn b/libs/deps-template/resources/io/github/kit_clj/kit/deps.edn similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/deps.edn rename to libs/deps-template/resources/io/github/kit_clj/kit/deps.edn diff --git a/libs/lein-template/resources/leiningen/new/kit/env/dev/clj/dev_middleware.clj b/libs/deps-template/resources/io/github/kit_clj/kit/env/dev/clj/dev_middleware.clj similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/env/dev/clj/dev_middleware.clj rename to libs/deps-template/resources/io/github/kit_clj/kit/env/dev/clj/dev_middleware.clj diff --git a/libs/lein-template/resources/leiningen/new/kit/env/dev/clj/env.clj b/libs/deps-template/resources/io/github/kit_clj/kit/env/dev/clj/env.clj similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/env/dev/clj/env.clj rename to libs/deps-template/resources/io/github/kit_clj/kit/env/dev/clj/env.clj diff --git a/libs/lein-template/resources/leiningen/new/kit/env/dev/clj/user.clj b/libs/deps-template/resources/io/github/kit_clj/kit/env/dev/clj/user.clj similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/env/dev/clj/user.clj rename to libs/deps-template/resources/io/github/kit_clj/kit/env/dev/clj/user.clj diff --git a/libs/lein-template/resources/leiningen/new/kit/env/dev/resources/logback.xml b/libs/deps-template/resources/io/github/kit_clj/kit/env/dev/resources/logback.xml similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/env/dev/resources/logback.xml rename to libs/deps-template/resources/io/github/kit_clj/kit/env/dev/resources/logback.xml diff --git a/libs/lein-template/resources/leiningen/new/kit/env/prod/clj/env.clj b/libs/deps-template/resources/io/github/kit_clj/kit/env/prod/clj/env.clj similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/env/prod/clj/env.clj rename to libs/deps-template/resources/io/github/kit_clj/kit/env/prod/clj/env.clj diff --git a/libs/lein-template/resources/leiningen/new/kit/env/prod/resources/logback.xml b/libs/deps-template/resources/io/github/kit_clj/kit/env/prod/resources/logback.xml similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/env/prod/resources/logback.xml rename to libs/deps-template/resources/io/github/kit_clj/kit/env/prod/resources/logback.xml diff --git a/libs/lein-template/resources/leiningen/new/kit/env/test/resources/logback.xml b/libs/deps-template/resources/io/github/kit_clj/kit/env/test/resources/logback.xml similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/env/test/resources/logback.xml rename to libs/deps-template/resources/io/github/kit_clj/kit/env/test/resources/logback.xml diff --git a/libs/lein-template/resources/leiningen/new/kit/gitignore b/libs/deps-template/resources/io/github/kit_clj/kit/gitignore similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/gitignore rename to libs/deps-template/resources/io/github/kit_clj/kit/gitignore diff --git a/libs/lein-template/resources/leiningen/new/kit/kit.edn b/libs/deps-template/resources/io/github/kit_clj/kit/kit.edn similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/kit.edn rename to libs/deps-template/resources/io/github/kit_clj/kit/kit.edn diff --git a/libs/lein-template/resources/leiningen/new/kit/kit.git-config.edn b/libs/deps-template/resources/io/github/kit_clj/kit/kit.git-config.edn similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/kit.git-config.edn rename to libs/deps-template/resources/io/github/kit_clj/kit/kit.git-config.edn diff --git a/libs/lein-template/resources/leiningen/new/kit/resources/migrations/placeholder.txt b/libs/deps-template/resources/io/github/kit_clj/kit/resources/migrations/placeholder.txt similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/resources/migrations/placeholder.txt rename to libs/deps-template/resources/io/github/kit_clj/kit/resources/migrations/placeholder.txt diff --git a/libs/lein-template/resources/leiningen/new/kit/resources/queries.sql b/libs/deps-template/resources/io/github/kit_clj/kit/resources/queries.sql similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/resources/queries.sql rename to libs/deps-template/resources/io/github/kit_clj/kit/resources/queries.sql diff --git a/libs/lein-template/resources/leiningen/new/kit/resources/system.edn b/libs/deps-template/resources/io/github/kit_clj/kit/resources/system.edn similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/resources/system.edn rename to libs/deps-template/resources/io/github/kit_clj/kit/resources/system.edn diff --git a/libs/lein-template/resources/leiningen/new/kit/src/clj/config.clj b/libs/deps-template/resources/io/github/kit_clj/kit/src/clj/config.clj similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/src/clj/config.clj rename to libs/deps-template/resources/io/github/kit_clj/kit/src/clj/config.clj diff --git a/libs/lein-template/resources/leiningen/new/kit/src/clj/core.clj b/libs/deps-template/resources/io/github/kit_clj/kit/src/clj/core.clj similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/src/clj/core.clj rename to libs/deps-template/resources/io/github/kit_clj/kit/src/clj/core.clj diff --git a/libs/lein-template/resources/leiningen/new/kit/src/clj/web/controllers/health.clj b/libs/deps-template/resources/io/github/kit_clj/kit/src/clj/web/controllers/health.clj similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/src/clj/web/controllers/health.clj rename to libs/deps-template/resources/io/github/kit_clj/kit/src/clj/web/controllers/health.clj diff --git a/libs/lein-template/resources/leiningen/new/kit/src/clj/web/handler.clj b/libs/deps-template/resources/io/github/kit_clj/kit/src/clj/web/handler.clj similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/src/clj/web/handler.clj rename to libs/deps-template/resources/io/github/kit_clj/kit/src/clj/web/handler.clj diff --git a/libs/lein-template/resources/leiningen/new/kit/src/clj/web/middleware/core.clj b/libs/deps-template/resources/io/github/kit_clj/kit/src/clj/web/middleware/core.clj similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/src/clj/web/middleware/core.clj rename to libs/deps-template/resources/io/github/kit_clj/kit/src/clj/web/middleware/core.clj diff --git a/libs/lein-template/resources/leiningen/new/kit/src/clj/web/middleware/exception.clj b/libs/deps-template/resources/io/github/kit_clj/kit/src/clj/web/middleware/exception.clj similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/src/clj/web/middleware/exception.clj rename to libs/deps-template/resources/io/github/kit_clj/kit/src/clj/web/middleware/exception.clj diff --git a/libs/lein-template/resources/leiningen/new/kit/src/clj/web/middleware/formats.clj b/libs/deps-template/resources/io/github/kit_clj/kit/src/clj/web/middleware/formats.clj similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/src/clj/web/middleware/formats.clj rename to libs/deps-template/resources/io/github/kit_clj/kit/src/clj/web/middleware/formats.clj diff --git a/libs/lein-template/resources/leiningen/new/kit/src/clj/web/routes/api.clj b/libs/deps-template/resources/io/github/kit_clj/kit/src/clj/web/routes/api.clj similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/src/clj/web/routes/api.clj rename to libs/deps-template/resources/io/github/kit_clj/kit/src/clj/web/routes/api.clj diff --git a/libs/lein-template/resources/leiningen/new/kit/src/clj/web/routes/utils.clj b/libs/deps-template/resources/io/github/kit_clj/kit/src/clj/web/routes/utils.clj similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/src/clj/web/routes/utils.clj rename to libs/deps-template/resources/io/github/kit_clj/kit/src/clj/web/routes/utils.clj diff --git a/libs/lein-template/resources/leiningen/new/kit/test/clj/core_test.clj b/libs/deps-template/resources/io/github/kit_clj/kit/test/clj/core_test.clj similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/test/clj/core_test.clj rename to libs/deps-template/resources/io/github/kit_clj/kit/test/clj/core_test.clj diff --git a/libs/lein-template/resources/leiningen/new/kit/test/clj/test_utils.clj b/libs/deps-template/resources/io/github/kit_clj/kit/test/clj/test_utils.clj similarity index 100% rename from libs/lein-template/resources/leiningen/new/kit/test/clj/test_utils.clj rename to libs/deps-template/resources/io/github/kit_clj/kit/test/clj/test_utils.clj diff --git a/libs/lein-template/resources/versions.edn b/libs/deps-template/resources/io/github/kit_clj/kit/versions.edn similarity index 100% rename from libs/lein-template/resources/versions.edn rename to libs/deps-template/resources/io/github/kit_clj/kit/versions.edn From 3277578feb92b0599fefc8b85ce7e3bccf5e2969 Mon Sep 17 00:00:00 2001 From: Radford Smith <11401+rads@users.noreply.github.com> Date: Wed, 17 Aug 2022 17:36:49 -0700 Subject: [PATCH 2/3] Add deps-template dep to lein-template --- build.clj | 2 +- .../io/github/kit_clj/kit/versions.edn | 3 ++- libs/lein-template/deps.edn | 5 +++-- .../src/leiningen/new/io/github/kit_clj.clj | 2 +- .../new/io/github/kit_clj/options/helpers.clj | 19 +++++++++++++++---- 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/build.clj b/build.clj index 761bff5..e15144e 100644 --- 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/resources/io/github/kit_clj/kit/versions.edn b/libs/deps-template/resources/io/github/kit_clj/kit/versions.edn index be9fce4..2777a3a 100644 --- a/libs/deps-template/resources/io/github/kit_clj/kit/versions.edn +++ b/libs/deps-template/resources/io/github/kit_clj/kit/versions.edn @@ -16,4 +16,5 @@ "kit-sql-conman" "1.0.2" "kit-sql-hikari" "1.0.1" "kit-undertow" "1.0.2" - "lein-template" "0.1.25"} + "lein-template" "0.1.25" + "deps-template" "0.1.25"} diff --git a/libs/lein-template/deps.edn b/libs/lein-template/deps.edn index 81f03d2..c31340d 100644 --- 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.25"}}} 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 index 25e8c26..974a832 100644 --- 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 index 15282cc..594c765 100644 --- 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 + (templates/render-text (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)) From fd53e974575ccec37849114afde654382ed8a680 Mon Sep 17 00:00:00 2001 From: Radford Smith <11401+rads@users.noreply.github.com> Date: Wed, 17 Aug 2022 20:03:45 -0700 Subject: [PATCH 3/3] Use selmer-renderer --- .../src/leiningen/new/io/github/kit_clj/options/helpers.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 594c765..29779d5 100644 --- 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 @@ -21,7 +21,7 @@ (let [path (resource-path->template-path template)] (if-let [resource (io/resource path)] (if data - (templates/render-text (templates/slurp-resource resource) data) + (selmer-renderer (templates/slurp-resource resource) data) (io/reader resource)) (throw (ex-info (format "Template resource '%s' not found." path) {})))))