Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add deps-template #65

Merged
merged 4 commits into from
Sep 15, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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"}))
Expand Down
1 change: 1 addition & 0 deletions libs/deps-template/deps.edn
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{:paths ["resources"]}
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
5 changes: 3 additions & 2 deletions libs/lein-template/deps.edn
Original file line number Diff line number Diff line change
@@ -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"}}}
yogthos marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion libs/lein-template/src/leiningen/new/io/github/kit_clj.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down
Original file line number Diff line number Diff line change
@@ -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")

Expand All @@ -13,12 +14,22 @@
options
{:tag-open \< :tag-close \> :filter-open \< :filter-close \>}))

(def render-text (renderer template-name selmer-renderer))
yogthos marked this conversation as resolved.
Show resolved Hide resolved
(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))

Expand Down