From b1b483d2ae77e80623d99561f6343f8f1fedbb97 Mon Sep 17 00:00:00 2001 From: Dorab Patel Date: Wed, 13 Oct 2021 14:08:37 -0700 Subject: [PATCH 01/11] Moved lein template files into structured directories. --- src/leiningen/new/cryogen.clj | 28 +++++++++--------- .../{ => content}/asc/pages/adoc-page.asc | 0 .../asc/posts/2014-10-10-adoc-post.asc | 0 .../new/cryogen/{ => content}/config.edn | 0 .../new/cryogen/{ => content}/css/example.css | 0 .../{ => content}/css/sassexample.scss | 0 .../new/cryogen/{ => content}/img/cryogen.png | Bin .../cryogen/{ => content}/md/pages/about.md | 0 .../{ => content}/md/pages/another-page.md | 0 .../md/posts/2014-03-10-first-post.md | 0 .../md/posts/2014-11-04-second-post.md | 0 .../{ => content}/md/posts/2020-12-03-docs.md | 0 src/leiningen/new/cryogen/{ => root}/deps.edn | 0 .../new/cryogen/{ => root}/gitignore | 0 .../new/cryogen/{ => root}/project.clj | 0 15 files changed, 14 insertions(+), 14 deletions(-) rename src/leiningen/new/cryogen/{ => content}/asc/pages/adoc-page.asc (100%) rename src/leiningen/new/cryogen/{ => content}/asc/posts/2014-10-10-adoc-post.asc (100%) rename src/leiningen/new/cryogen/{ => content}/config.edn (100%) rename src/leiningen/new/cryogen/{ => content}/css/example.css (100%) rename src/leiningen/new/cryogen/{ => content}/css/sassexample.scss (100%) rename src/leiningen/new/cryogen/{ => content}/img/cryogen.png (100%) rename src/leiningen/new/cryogen/{ => content}/md/pages/about.md (100%) rename src/leiningen/new/cryogen/{ => content}/md/pages/another-page.md (100%) rename src/leiningen/new/cryogen/{ => content}/md/posts/2014-03-10-first-post.md (100%) rename src/leiningen/new/cryogen/{ => content}/md/posts/2014-11-04-second-post.md (100%) rename src/leiningen/new/cryogen/{ => content}/md/posts/2020-12-03-docs.md (100%) rename src/leiningen/new/cryogen/{ => root}/deps.edn (100%) rename src/leiningen/new/cryogen/{ => root}/gitignore (100%) rename src/leiningen/new/cryogen/{ => root}/project.clj (100%) diff --git a/src/leiningen/new/cryogen.clj b/src/leiningen/new/cryogen.clj index 985cc18..373ae3d 100644 --- a/src/leiningen/new/cryogen.clj +++ b/src/leiningen/new/cryogen.clj @@ -108,24 +108,24 @@ (with-redefs [leiningen.new.templates/render-text (fn [text _] text)] (apply ->files options - [".gitignore" (render "gitignore")] - ["project.clj" (render "project.clj")] - ["deps.edn" (render "deps.edn")] + [".gitignore" (render "root/gitignore")] + ["project.clj" (render "root/project.clj")] + ["deps.edn" (render "root/deps.edn")] ;;static resources - ["content/img/cryogen.png" (resource "img/cryogen.png")] - ["content/css/example.css" (resource "css/example.css")] - ["content/css/sassexample.scss" (resource "css/sassexample.scss")] + ["content/img/cryogen.png" (resource "content/img/cryogen.png")] + ["content/css/example.css" (resource "content/css/example.css")] + ["content/css/sassexample.scss" (resource "content/css/sassexample.scss")] ;;Markdown templates - ["content/md/pages/about.md" (render "md/pages/about.md")] - ["content/md/pages/another-page.md" (render "md/pages/another-page.md")] - ["content/md/posts/2014-03-10-first-post.md" (render "md/posts/2014-03-10-first-post.md")] - ["content/md/posts/2014-11-04-second-post.md" (render "md/posts/2014-11-04-second-post.md")] - ["content/md/posts/2020-12-03-docs.md" (render "md/posts/2020-12-03-docs.md")] + ["content/md/pages/about.md" (render "content/md/pages/about.md")] + ["content/md/pages/another-page.md" (render "content/md/pages/another-page.md")] + ["content/md/posts/2014-03-10-first-post.md" (render "content/md/posts/2014-03-10-first-post.md")] + ["content/md/posts/2014-11-04-second-post.md" (render "content/md/posts/2014-11-04-second-post.md")] + ["content/md/posts/2020-12-03-docs.md" (render "content/md/posts/2020-12-03-docs.md")] ;;Asciidoc templates - ["content/asc/pages/adoc-page.asc" (render "asc/pages/adoc-page.asc")] - ["content/asc/posts/2014-10-10-adoc-post.asc" (render "asc/posts/2014-10-10-adoc-post.asc")] + ["content/asc/pages/adoc-page.asc" (render "content/asc/pages/adoc-page.asc")] + ["content/asc/posts/2014-10-10-adoc-post.asc" (render "content/asc/posts/2014-10-10-adoc-post.asc")] ;;config - ["content/config.edn" (render "config.edn")] + ["content/config.edn" (render "content/config.edn")] ;;namespaces ["src/cryogen/core.clj" (render "src/cryogen/core.clj")] ["src/cryogen/server.clj" (render "src/cryogen/server.clj")] diff --git a/src/leiningen/new/cryogen/asc/pages/adoc-page.asc b/src/leiningen/new/cryogen/content/asc/pages/adoc-page.asc similarity index 100% rename from src/leiningen/new/cryogen/asc/pages/adoc-page.asc rename to src/leiningen/new/cryogen/content/asc/pages/adoc-page.asc diff --git a/src/leiningen/new/cryogen/asc/posts/2014-10-10-adoc-post.asc b/src/leiningen/new/cryogen/content/asc/posts/2014-10-10-adoc-post.asc similarity index 100% rename from src/leiningen/new/cryogen/asc/posts/2014-10-10-adoc-post.asc rename to src/leiningen/new/cryogen/content/asc/posts/2014-10-10-adoc-post.asc diff --git a/src/leiningen/new/cryogen/config.edn b/src/leiningen/new/cryogen/content/config.edn similarity index 100% rename from src/leiningen/new/cryogen/config.edn rename to src/leiningen/new/cryogen/content/config.edn diff --git a/src/leiningen/new/cryogen/css/example.css b/src/leiningen/new/cryogen/content/css/example.css similarity index 100% rename from src/leiningen/new/cryogen/css/example.css rename to src/leiningen/new/cryogen/content/css/example.css diff --git a/src/leiningen/new/cryogen/css/sassexample.scss b/src/leiningen/new/cryogen/content/css/sassexample.scss similarity index 100% rename from src/leiningen/new/cryogen/css/sassexample.scss rename to src/leiningen/new/cryogen/content/css/sassexample.scss diff --git a/src/leiningen/new/cryogen/img/cryogen.png b/src/leiningen/new/cryogen/content/img/cryogen.png similarity index 100% rename from src/leiningen/new/cryogen/img/cryogen.png rename to src/leiningen/new/cryogen/content/img/cryogen.png diff --git a/src/leiningen/new/cryogen/md/pages/about.md b/src/leiningen/new/cryogen/content/md/pages/about.md similarity index 100% rename from src/leiningen/new/cryogen/md/pages/about.md rename to src/leiningen/new/cryogen/content/md/pages/about.md diff --git a/src/leiningen/new/cryogen/md/pages/another-page.md b/src/leiningen/new/cryogen/content/md/pages/another-page.md similarity index 100% rename from src/leiningen/new/cryogen/md/pages/another-page.md rename to src/leiningen/new/cryogen/content/md/pages/another-page.md diff --git a/src/leiningen/new/cryogen/md/posts/2014-03-10-first-post.md b/src/leiningen/new/cryogen/content/md/posts/2014-03-10-first-post.md similarity index 100% rename from src/leiningen/new/cryogen/md/posts/2014-03-10-first-post.md rename to src/leiningen/new/cryogen/content/md/posts/2014-03-10-first-post.md diff --git a/src/leiningen/new/cryogen/md/posts/2014-11-04-second-post.md b/src/leiningen/new/cryogen/content/md/posts/2014-11-04-second-post.md similarity index 100% rename from src/leiningen/new/cryogen/md/posts/2014-11-04-second-post.md rename to src/leiningen/new/cryogen/content/md/posts/2014-11-04-second-post.md diff --git a/src/leiningen/new/cryogen/md/posts/2020-12-03-docs.md b/src/leiningen/new/cryogen/content/md/posts/2020-12-03-docs.md similarity index 100% rename from src/leiningen/new/cryogen/md/posts/2020-12-03-docs.md rename to src/leiningen/new/cryogen/content/md/posts/2020-12-03-docs.md diff --git a/src/leiningen/new/cryogen/deps.edn b/src/leiningen/new/cryogen/root/deps.edn similarity index 100% rename from src/leiningen/new/cryogen/deps.edn rename to src/leiningen/new/cryogen/root/deps.edn diff --git a/src/leiningen/new/cryogen/gitignore b/src/leiningen/new/cryogen/root/gitignore similarity index 100% rename from src/leiningen/new/cryogen/gitignore rename to src/leiningen/new/cryogen/root/gitignore diff --git a/src/leiningen/new/cryogen/project.clj b/src/leiningen/new/cryogen/root/project.clj similarity index 100% rename from src/leiningen/new/cryogen/project.clj rename to src/leiningen/new/cryogen/root/project.clj From 01235ee3a28de8ce94140d03dd40c1abf3941b35 Mon Sep 17 00:00:00 2001 From: Dorab Patel Date: Wed, 13 Oct 2021 14:28:19 -0700 Subject: [PATCH 02/11] First cut at a template.edn for the deps-new template. --- depstemplate/deps.edn | 2 ++ depstemplate/resources/org/cryogenweb/new/template.edn | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 depstemplate/deps.edn create mode 100644 depstemplate/resources/org/cryogenweb/new/template.edn diff --git a/depstemplate/deps.edn b/depstemplate/deps.edn new file mode 100644 index 0000000..c8b453e --- /dev/null +++ b/depstemplate/deps.edn @@ -0,0 +1,2 @@ +{:paths ["resources"] + } diff --git a/depstemplate/resources/org/cryogenweb/new/template.edn b/depstemplate/resources/org/cryogenweb/new/template.edn new file mode 100644 index 0000000..513e7d3 --- /dev/null +++ b/depstemplate/resources/org/cryogenweb/new/template.edn @@ -0,0 +1,8 @@ +{:transform + [ + ["../../../../../src/leiningen/new/cryogen/root" "" {"gitignore" ".gitignore"} :raw] + ["../../../../../src/leiningen/new/cryogen/themes" "themes" :raw] + ["../../../../../src/leiningen/new/cryogen/content" "content" :raw] + ["../../../../../src/leiningen/new/cryogen/src" "src" :raw] + ] + } From dce3e410a11d45a97e498eacfea8d5d97b9c5af9 Mon Sep 17 00:00:00 2001 From: Dorab Patel Date: Wed, 13 Oct 2021 14:46:48 -0700 Subject: [PATCH 03/11] Update the README and CHANGELOG. --- CHANGELOG.md | 6 +++++- README.md | 28 +++++++++++++++++++++------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a233728..c6f2bf2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ sections for `Highlights`, `Breaking` and `Changes since x.y.z`. ## [Unreleased] +### Highlights +- Support a `deps-new` template. + ## [0.6.4] - 2021-10-04 ### Highlights @@ -57,8 +60,9 @@ sections for `Highlights`, `Breaking` and `Changes since x.y.z`. - Switch to `cryogen-flexmark`. - Handle case where `blog-prefix` is blank. -[Unreleased]: https://github.com/cryogen-project/cryogen/compare/0.6.3...HEAD +[Unreleased]: https://github.com/cryogen-project/cryogen/compare/0.6.4...HEAD +[0.6.4]: https://github.com/cryogen-project/cryogen/compare/0.6.3...0.6.4 [0.6.3]: https://github.com/cryogen-project/cryogen/compare/0.6.2...0.6.3 [0.6.2]: https://github.com/cryogen-project/cryogen/compare/0.6.1...0.6.2 [0.6.1]: https://github.com/cryogen-project/cryogen/compare/0.6.0...0.6.1 diff --git a/README.md b/README.md index 7c200e5..7e86285 100644 --- a/README.md +++ b/README.md @@ -23,23 +23,27 @@ This ReadMe only documents a subset of Cryogen's features. For additional docume * Sass/SCSS compilation * Klipse Integration -## Prerequisites +## Usage -You will need [Leiningen][1] 2.5.0 or above installed. +### Creating a New Site -[1]: https://github.com/technomancy/leiningen +You can create a new website using either one of `leiningen` or `clj-new` or `deps-new`. -## Usage +#### Creating a New Site With Leiningen -### Creating a New Site +You will need [Leiningen][1] 2.5.0 or above installed. + +[1]: https://github.com/technomancy/leiningen -A new site can be created using the Cryogen template as follows: +A new site can be created using the Cryogen leiningen template as follows: ``` lein new cryogen my-blog ``` -or, alternatively, using [`clj-new as a tool`](https://github.com/seancorfield/clj-new#installation-as-a-tool): +#### Creating a New Site With clj-new as a Tool + +Alternatively, use [`clj-new as a tool`](https://github.com/seancorfield/clj-new#installation-as-a-tool): ``` clojure -Ttools install com.github.seancorfield/clj-new '{:git/tag "v1.2.362"}' :as clj-new # update to latest! @@ -47,6 +51,16 @@ clojure -Tclj-new create :template cryogen :name myname/myblog :force true cd myname/myblog/ ``` +#### Creating a New Site With deps-new as a Tool + +Alternatively, use [`deps-new as a tool`](https://github.com/seancorfield/deps-new#deps-new-): + +``` +clojure -Ttools install io.github.seancorfield/deps-new '{:git/tag "v0.4.0"}' :as new +clojure -Sdeps '{:deps {org.cryogen/deps-new-template {:mvn/version "1.2.3"}}}' -Tnew :template org.cryogenweb/new :name myname/myblog +cd myname/myblog/ +``` + ### Running the Server The web server can be started from the `my-blog` directory using either Leiningen: From e3eae91cb8c571b900158370a24591655cb8dfd0 Mon Sep 17 00:00:00 2001 From: Dorab Patel Date: Wed, 13 Oct 2021 14:50:10 -0700 Subject: [PATCH 04/11] Specify that the unadorned ```s are for the shell. --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 7e86285..c5846d3 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ You will need [Leiningen][1] 2.5.0 or above installed. A new site can be created using the Cryogen leiningen template as follows: -``` +```sh lein new cryogen my-blog ``` @@ -45,7 +45,7 @@ lein new cryogen my-blog Alternatively, use [`clj-new as a tool`](https://github.com/seancorfield/clj-new#installation-as-a-tool): -``` +```sh clojure -Ttools install com.github.seancorfield/clj-new '{:git/tag "v1.2.362"}' :as clj-new # update to latest! clojure -Tclj-new create :template cryogen :name myname/myblog :force true cd myname/myblog/ @@ -55,7 +55,7 @@ cd myname/myblog/ Alternatively, use [`deps-new as a tool`](https://github.com/seancorfield/deps-new#deps-new-): -``` +```sh clojure -Ttools install io.github.seancorfield/deps-new '{:git/tag "v0.4.0"}' :as new clojure -Sdeps '{:deps {org.cryogen/deps-new-template {:mvn/version "1.2.3"}}}' -Tnew :template org.cryogenweb/new :name myname/myblog cd myname/myblog/ @@ -65,13 +65,13 @@ cd myname/myblog/ The web server can be started from the `my-blog` directory using either Leiningen: -```bash +```sh lein serve # or lein serve:fast ``` or tools-deps: -```bash +```sh clojure -X:serve # or clojure -X:serve:fast ``` @@ -79,13 +79,13 @@ The server will watch for changes in the `content` and `themes` folders and reco You can also generate the content without bringing up a server either via: -``` +```sh lein run ``` or via: -``` +```sh clojure -M:build ``` From 66414dd85747e651a05088378d7de07b0c12e848 Mon Sep 17 00:00:00 2001 From: Dorab Patel Date: Wed, 13 Oct 2021 14:55:53 -0700 Subject: [PATCH 05/11] Updated README copyright notice to 2021. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c5846d3..282be67 100644 --- a/README.md +++ b/README.md @@ -228,6 +228,6 @@ A Clojure library to provide Markdown rendering to the cryogen-core compiler by ## License -Copyright © 2014-2020 Carmen La +Copyright © 2014-2021 Carmen La Distributed under the Eclipse Public License, the same as Clojure. From 4c68e566c05d43380ebd4d3173e8a301a0f8096c Mon Sep 17 00:00:00 2001 From: Dorab Patel Date: Thu, 14 Oct 2021 09:09:00 -0700 Subject: [PATCH 06/11] Removed orphan markup.clj file. --- .../new/cryogen/src/cryogen/markup.clj | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100644 src/leiningen/new/cryogen/src/cryogen/markup.clj diff --git a/src/leiningen/new/cryogen/src/cryogen/markup.clj b/src/leiningen/new/cryogen/src/cryogen/markup.clj deleted file mode 100644 index 1fa80ef..0000000 --- a/src/leiningen/new/cryogen/src/cryogen/markup.clj +++ /dev/null @@ -1,33 +0,0 @@ -(ns cryogen.markup - (:require [markdown.core :refer [md-to-html-string]] - [clojure.string :as s] - [cryogen-core.markup :as m]) - (:import org.asciidoctor.Asciidoctor$Factory - java.util.Collections)) - -(defn- markdown [] - (reify m/Markup - (dir [this] "md") - (ext [this] ".md") - (render-fn [this] - (fn [rdr] - (md-to-html-string - (->> (java.io.BufferedReader. rdr) - (line-seq) - (s/join "\n")) - :heading-anchors true))))) - -(defn- asciidoc [] - (reify m/Markup - (dir [this] "asc") - (ext [this] ".asc") - (render-fn [this] - (fn [rdr] - (.convert (Asciidoctor$Factory/create) - (->> (java.io.BufferedReader. rdr) - (line-seq) - (s/join "\n")) - (Collections/emptyMap)))))) - -(defn markups [] - [(markdown) (asciidoc)]) From 2d329353469c8c13e98f2ddddb3eb2526b803c49 Mon Sep 17 00:00:00 2001 From: Dorab Patel Date: Thu, 14 Oct 2021 14:39:59 -0700 Subject: [PATCH 07/11] Restructure files as per Sean Corfield's suggestion. This is to allow for deployment to clojars and to be able to use both lein and deps-new templates from that one artifact. Updated CHANGELOG. --- CHANGELOG.md | 11 ++++++++++- depstemplate/deps.edn => deps.edn | 0 .../resources/org/cryogenweb/new/template.edn | 8 -------- project.clj | 2 +- resources/org/cryogenweb/new/template.edn | 8 ++++++++ 5 files changed, 19 insertions(+), 10 deletions(-) rename depstemplate/deps.edn => deps.edn (100%) delete mode 100644 depstemplate/resources/org/cryogenweb/new/template.edn create mode 100644 resources/org/cryogenweb/new/template.edn diff --git a/CHANGELOG.md b/CHANGELOG.md index c6f2bf2..53e5e5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,9 +7,16 @@ sections for `Highlights`, `Breaking` and `Changes since x.y.z`. ## [Unreleased] +## [0.6.6] - 2021-10-14 + ### Highlights - Support a `deps-new` template. +## [0.6.5] - 2021-10-07 + +### Highlights +- Bump up cryogen-core. + ## [0.6.4] - 2021-10-04 ### Highlights @@ -60,8 +67,10 @@ sections for `Highlights`, `Breaking` and `Changes since x.y.z`. - Switch to `cryogen-flexmark`. - Handle case where `blog-prefix` is blank. -[Unreleased]: https://github.com/cryogen-project/cryogen/compare/0.6.4...HEAD +[Unreleased]: https://github.com/cryogen-project/cryogen/compare/0.6.6...HEAD +[0.6.4]: https://github.com/cryogen-project/cryogen/compare/0.6.5...0.6.6 +[0.6.4]: https://github.com/cryogen-project/cryogen/compare/0.6.4...0.6.5 [0.6.4]: https://github.com/cryogen-project/cryogen/compare/0.6.3...0.6.4 [0.6.3]: https://github.com/cryogen-project/cryogen/compare/0.6.2...0.6.3 [0.6.2]: https://github.com/cryogen-project/cryogen/compare/0.6.1...0.6.2 diff --git a/depstemplate/deps.edn b/deps.edn similarity index 100% rename from depstemplate/deps.edn rename to deps.edn diff --git a/depstemplate/resources/org/cryogenweb/new/template.edn b/depstemplate/resources/org/cryogenweb/new/template.edn deleted file mode 100644 index 513e7d3..0000000 --- a/depstemplate/resources/org/cryogenweb/new/template.edn +++ /dev/null @@ -1,8 +0,0 @@ -{:transform - [ - ["../../../../../src/leiningen/new/cryogen/root" "" {"gitignore" ".gitignore"} :raw] - ["../../../../../src/leiningen/new/cryogen/themes" "themes" :raw] - ["../../../../../src/leiningen/new/cryogen/content" "content" :raw] - ["../../../../../src/leiningen/new/cryogen/src" "src" :raw] - ] - } diff --git a/project.clj b/project.clj index 16cd338..c5539bd 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject cryogen/lein-template "0.6.5" +(defproject cryogen/lein-template "0.6.6" :description "A Leiningen template for the Cryogen static site generator" :url "https://github.com/cryogen-project/cryogen" :license {:name "Eclipse Public License" diff --git a/resources/org/cryogenweb/new/template.edn b/resources/org/cryogenweb/new/template.edn new file mode 100644 index 0000000..e99e1a2 --- /dev/null +++ b/resources/org/cryogenweb/new/template.edn @@ -0,0 +1,8 @@ +{:transform + [ + ["../../../../src/leiningen/new/cryogen/root" "" {"gitignore" ".gitignore"} :raw] + ["../../../../src/leiningen/new/cryogen/themes" "themes" :raw] + ["../../../../src/leiningen/new/cryogen/content" "content" :raw] + ["../../../../src/leiningen/new/cryogen/src" "src" :raw] + ] + } From 5ef6c5c30701e22b296c7fe9959a5035cb33ac5c Mon Sep 17 00:00:00 2001 From: Dorab Patel Date: Thu, 14 Oct 2021 15:03:47 -0700 Subject: [PATCH 08/11] Updated instructions on how to use this template with deps-new. --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 282be67..307f0ac 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@   -This ReadMe only documents a subset of Cryogen's features. For additional documentation please see the [cryogen site](http://cryogenweb.org). +This README only documents a subset of Cryogen's features. For additional documentation please see the [cryogen site](http://cryogenweb.org).   @@ -57,10 +57,13 @@ Alternatively, use [`deps-new as a tool`](https://github.com/seancorfield/deps-n ```sh clojure -Ttools install io.github.seancorfield/deps-new '{:git/tag "v0.4.0"}' :as new -clojure -Sdeps '{:deps {org.cryogen/deps-new-template {:mvn/version "1.2.3"}}}' -Tnew :template org.cryogenweb/new :name myname/myblog +clojure -Sdeps '{:deps {cryogen/lein-template {:mvn/version "RELEASE"}}}' -Tnew :template org.cryogenweb/new :name myname/myblog cd myname/myblog/ ``` +The artifact `cryogen/lein-template` contains both a leiningen +template and a deps-new template. + ### Running the Server The web server can be started from the `my-blog` directory using either Leiningen: From 78abcbbb35af0bfdcd873349bcfbd2393dd739dd Mon Sep 17 00:00:00 2001 From: Dorab Patel Date: Thu, 14 Oct 2021 15:28:03 -0700 Subject: [PATCH 09/11] Updated test instructions in CONTRIBUTING. --- CONTRIBUTING.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bdfe1fa..25c29c3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,6 +6,12 @@ The same [guidelines as in cryogen-core](https://github.com/cryogen-project/cryo Testing ------- -Clone the repo locally and switch to the branch you want to try. Then: +Clone the repo locally and switch to the branch you want to try. Then +(if using `clj-new`): + + clojure -Sdeps '{:deps {c/c {:local/root "/path/to/cryogen"}}}' -Tclj-new create :template cryogen :name myname/myblog :force true + +Or, if using `deps-new`: + + clojure -Sdeps '{:deps {c/c {:local/root "/path/to/cryogen"}}}' -Tnew :template cryogen :name myname/myblog - clojure -Sdeps '{:deps {c/c {:local/root "/path/to/cryogen"}}}' -Tclj-new create :template cryogen :name test1/myblog :force true From f7a0355c7ccc93b7ae21c3c707a2d452fc2de4c2 Mon Sep 17 00:00:00 2001 From: Dorab Patel Date: Thu, 14 Oct 2021 15:29:25 -0700 Subject: [PATCH 10/11] Use explicit code blocks. --- CONTRIBUTING.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 25c29c3..6d8e5c3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,10 +8,10 @@ Testing Clone the repo locally and switch to the branch you want to try. Then (if using `clj-new`): - - clojure -Sdeps '{:deps {c/c {:local/root "/path/to/cryogen"}}}' -Tclj-new create :template cryogen :name myname/myblog :force true - +```sh +clojure -Sdeps '{:deps {c/c {:local/root "/path/to/cryogen"}}}' -Tclj-new create :template cryogen :name myname/myblog :force true +``` Or, if using `deps-new`: - - clojure -Sdeps '{:deps {c/c {:local/root "/path/to/cryogen"}}}' -Tnew :template cryogen :name myname/myblog - +```sh +clojure -Sdeps '{:deps {c/c {:local/root "/path/to/cryogen"}}}' -Tnew :template cryogen :name myname/myblog +``` From 614095b7d509ffa36026990057f494c807bd21bd Mon Sep 17 00:00:00 2001 From: Dorab Patel Date: Thu, 14 Oct 2021 19:33:01 -0700 Subject: [PATCH 11/11] Update docs to use git deps for deps-new. Since deps-new does not work with jar files. Since it uses tools.build, which uses files in directories. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 307f0ac..f757bfd 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ Alternatively, use [`deps-new as a tool`](https://github.com/seancorfield/deps-n ```sh clojure -Ttools install io.github.seancorfield/deps-new '{:git/tag "v0.4.0"}' :as new -clojure -Sdeps '{:deps {cryogen/lein-template {:mvn/version "RELEASE"}}}' -Tnew :template org.cryogenweb/new :name myname/myblog +clojure -Sdeps '{:deps {io.github.cryogen-project/cryogen {:git/tag "0.6.6" :git/sha "FILLIN"}}}' -Tnew :template org.cryogenweb/new :name myname/myblog cd myname/myblog/ ```