Skip to content

Commit 99f2d5e

Browse files
committed
Fix command documentation failing in native-image
1 parent eedb179 commit 99f2d5e

9 files changed

Lines changed: 21 additions & 9 deletions

File tree

packages/kmono-cli/resources/META-INF/native-image/k16.kmono.cli/native-image.properties renamed to packages/kmono-cli/resources/META-INF/native-image/com.kepler16/kmono-cli/native-image.properties

File renamed without changes.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"resources": {
3+
"includes": [
4+
{
5+
"pattern": "k16/kmono/docs/.*\\.(md)$"
6+
}
7+
]
8+
}
9+
}

packages/kmono-cli/src/k16/kmono/cli/commands/clojure.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
(def command
8080
{:command "clojure"
8181
:summary "Run an augmented clojure command"
82-
:desc (io/resource "k16/kmono/docs/clojure.md")
82+
:desc (delay (io/resource "k16/kmono/docs/clojure.md"))
8383

8484
:options {:package-aliases opts/package-aliases-opt
8585

packages/kmono-cli/src/k16/kmono/cli/commands/cp.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
(def command
1414
{:command "cp"
1515
:summary "Produce a classpath string from a clojure project"
16-
:desc (io/resource "k16/kmono/docs/cp.md")
16+
:desc (delay (io/resource "k16/kmono/docs/cp.md"))
1717
:options {:aliases opts/aliases-opt
1818
:package-aliases opts/package-aliases-opt}
1919
:run-fn cp-command})

packages/kmono-cli/src/k16/kmono/cli/commands/exec.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
(def command
5656
{:command "exec"
5757
:summary "Run a given command in workspace packages"
58-
:desc (io/resource "k16/kmono/docs/exec.md")
58+
:desc (delay (io/resource "k16/kmono/docs/exec.md"))
5959
:options {:run-in-order opts/run-in-order-opt
6060
:skip-unchanged opts/skip-unchanged-opt
6161
:changed opts/changed-opt

packages/kmono-cli/src/k16/kmono/cli/commands/query.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
(def command
103103
{:command "query"
104104
:summary "Query information about the package graph"
105-
:desc (io/resource "k16/kmono/docs/query.md")
105+
:desc (delay (io/resource "k16/kmono/docs/query.md"))
106106
:options {:with-versions with-versions
107107
:with-changes-since with-changes-since
108108
:with-changes with-changes

packages/kmono-cli/src/k16/kmono/cli/commands/repl.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
(def command
3535
{:command "repl"
3636
:summary "Start a clojure repl"
37-
:desc (io/resource "k16/kmono/docs/repl.md")
37+
:desc (delay (io/resource "k16/kmono/docs/repl.md"))
3838
:options {:aliases opts/aliases-opt
3939
:package-aliases opts/package-aliases-opt}
4040
:run-fn repl-command})

packages/kmono-cli/src/k16/kmono/cli/commands/run.clj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
(ns k16.kmono.cli.commands.run
22
(:require
3+
[clojure.java.io :as io]
34
[k16.kmono.cli.common.context :as common.context]
45
[k16.kmono.cli.common.log :as common.log]
56
[k16.kmono.cli.common.opts :as opts]
@@ -8,8 +9,7 @@
89
[k16.kmono.cp :as kmono.cp]
910
[k16.kmono.exec :as kmono.exec]
1011
[k16.kmono.log :as log]
11-
[k16.kmono.version :as kmono.version]
12-
[clojure.java.io :as io]))
12+
[k16.kmono.version :as kmono.version]))
1313

1414
(set! *warn-on-reflection* true)
1515

@@ -63,7 +63,7 @@
6363
(def command
6464
{:command "run"
6565
:summary "Run aliases in workspace packages"
66-
:desc (io/resource "k16/kmono/docs/run.md")
66+
:desc (delay (io/resource "k16/kmono/docs/run.md"))
6767
:options {:run-in-order opts/run-in-order-opt
6868
:skip-unchanged opts/skip-unchanged-opt
6969
:changed opts/changed-opt

packages/kmono-cli/src/k16/kmono/cli/parser.clj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@
2121
(println desc)
2222

2323
(instance? java.net.URL desc)
24-
(println (slurp desc))))
24+
(println (slurp desc))
25+
26+
(instance? clojure.lang.Delay desc)
27+
(println (slurp @desc))))
2528

2629
(println "Usage:")
2730
(let [path (conj summary-path command)]

0 commit comments

Comments
 (0)