Skip to content

Commit

Permalink
Version 0.2.16-alpha. Pass in project instead of project name as argu…
Browse files Browse the repository at this point in the history
…ment to execute-setup-fn (test orchestrator bug fix). Updated output from create_example.sh script.
  • Loading branch information
tengstrand committed Dec 8, 2022
1 parent 28d8848 commit 441e710
Show file tree
Hide file tree
Showing 13 changed files with 62 additions and 66 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
(test-runner-contract/test-runner-name test-runner))]
(if-not (test-runner-contract/tests-present? test-runner runner-opts)
(println (str "No tests to run " for-project-using-runner "."))
(if (execute-setup-fn (:name project) color-mode runner-opts)
(if (execute-setup-fn project color-mode runner-opts)
(try
(println (str "Running tests " for-project-using-runner "..."))
(test-runner-contract/run-tests test-runner runner-opts)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
(def major 0)
(def minor 2)
(def patch 16)
(def revision "alpha-issue254-02")
(def revision "alpha")
(def name (str major "." minor "." patch "-" revision))

(def date "2022-12-08")
Expand Down
2 changes: 1 addition & 1 deletion doc/commands.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ poly help
```

```
Poly 0.2.16-alpha-issue254 (2022-11-04) - https://github.com/polyfy/polylith
Poly 0.2.16-alpha (2022-12-08) - https://github.com/polyfy/polylith
poly CMD [ARGS] - where CMD [ARGS] are:
Expand Down
58 changes: 29 additions & 29 deletions examples/doc-example/ws.edn
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
[{:name "core",
:namespace "se.example.cli.core",
:file-path
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-08-10-071458.eKT8h7f4/example/bases/cli/src/se/example/cli/core.clj",
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-12-08-213505.NZspK7fl/example/bases/cli/src/se/example/cli/core.clj",
:imports ["se.example.user.interface"]}],
:test
[{:name "core-test",
:namespace "se.example.cli.core-test",
:file-path
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-08-10-071458.eKT8h7f4/example/bases/cli/test/se/example/cli/core_test.clj",
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-12-08-213505.NZspK7fl/example/bases/cli/test/se/example/cli/core_test.clj",
:imports ["clojure.test" "se.example.cli.core"]}]},
:lib-deps {},
:lines-of-code {:src 7, :test 6},
Expand All @@ -27,18 +27,18 @@
[{:name "core",
:namespace "se.example.user-api.core",
:file-path
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-08-10-071458.eKT8h7f4/example/bases/user-api/src/se/example/user_api/core.clj",
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-12-08-213505.NZspK7fl/example/bases/user-api/src/se/example/user_api/core.clj",
:imports ["se.example.user-api.api" "slacker.server"]}
{:name "api",
:namespace "se.example.user-api.api",
:file-path
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-08-10-071458.eKT8h7f4/example/bases/user-api/src/se/example/user_api/api.clj",
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-12-08-213505.NZspK7fl/example/bases/user-api/src/se/example/user_api/api.clj",
:imports ["se.example.user.interface"]}],
:test
[{:name "core-test",
:namespace "se.example.user-api.core-test",
:file-path
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-08-10-071458.eKT8h7f4/example/bases/user-api/test/se/example/user_api/core_test.clj",
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-12-08-213505.NZspK7fl/example/bases/user-api/test/se/example/user_api/core_test.clj",
:imports ["clojure.test" "se.example.user-api.core"]}]},
:lib-deps
{:src
Expand All @@ -51,7 +51,7 @@
:interface-deps {:src ["user"], :test []}}],
:changes
{:since "stable",
:since-sha "f387b4dcdd23c4db6219fbb8d46d8f0712c3f58c",
:since-sha "d9e0fdef0e7e848f8b51ea14a80d5ee9e441b9e5",
:since-tag "stable-lisa",
:changed-files
["bases/user-api/deps.edn"
Expand All @@ -67,7 +67,7 @@
"projects/user-service/deps.edn"
"workspace.edn"],
:git-diff-command
"git diff f387b4dcdd23c4db6219fbb8d46d8f0712c3f58c --name-only",
"git diff d9e0fdef0e7e848f8b51ea14a80d5ee9e441b9e5 --name-only",
:changed-components ["user-remote"],
:changed-bases ["user-api"],
:changed-projects ["command-line" "user-service"],
Expand All @@ -94,18 +94,18 @@
[{:name "interface",
:namespace "se.example.user.interface",
:file-path
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-08-10-071458.eKT8h7f4/example/components/user/src/se/example/user/interface.clj",
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-12-08-213505.NZspK7fl/example/components/user/src/se/example/user/interface.clj",
:imports ["se.example.user.core"]}
{:name "core",
:namespace "se.example.user.core",
:file-path
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-08-10-071458.eKT8h7f4/example/components/user/src/se/example/user/core.clj",
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-12-08-213505.NZspK7fl/example/components/user/src/se/example/user/core.clj",
:imports []}],
:test
[{:name "interface-test",
:namespace "se.example.user.interface-test",
:file-path
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-08-10-071458.eKT8h7f4/example/components/user/test/se/example/user/interface_test.clj",
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-12-08-213505.NZspK7fl/example/components/user/test/se/example/user/interface_test.clj",
:imports ["clojure.test" "se.example.user.interface"]}]},
:lib-imports {:test ["clojure.test"]},
:name "user",
Expand All @@ -123,18 +123,18 @@
[{:name "interface",
:namespace "se.example.user.interface",
:file-path
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-08-10-071458.eKT8h7f4/example/components/user-remote/src/se/example/user/interface.clj",
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-12-08-213505.NZspK7fl/example/components/user-remote/src/se/example/user/interface.clj",
:imports ["se.example.user.core"]}
{:name "core",
:namespace "se.example.user.core",
:file-path
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-08-10-071458.eKT8h7f4/example/components/user-remote/src/se/example/user/core.clj",
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-12-08-213505.NZspK7fl/example/components/user-remote/src/se/example/user/core.clj",
:imports ["slacker.client"]}],
:test
[{:name "interface-test",
:namespace "se.example.user.interface-test",
:file-path
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-08-10-071458.eKT8h7f4/example/components/user-remote/test/se/example/user/interface_test.clj",
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-12-08-213505.NZspK7fl/example/components/user-remote/test/se/example/user/interface_test.clj",
:imports ["clojure.test" "se.example.user.interface"]}]},
:lib-imports {:src ["slacker.client"], :test ["clojure.test"]},
:name "user-remote",
Expand Down Expand Up @@ -198,12 +198,12 @@
[{:name "project.command-line.test-setup",
:namespace "project.command-line.test-setup",
:file-path
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-08-10-071458.eKT8h7f4/example/projects/command-line/test/project/command_line/test_setup.clj",
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-12-08-213505.NZspK7fl/example/projects/command-line/test/project/command_line/test_setup.clj",
:imports ["clojure.test"]}
{:name "project.command-line.dummy-test",
:namespace "project.command-line.dummy_test",
:file-path
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-08-10-071458.eKT8h7f4/example/projects/command-line/test/project/command_line/dummy_test.clj",
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-12-08-213505.NZspK7fl/example/projects/command-line/test/project/command_line/dummy_test.clj",
:imports ["clojure.test"]}]},
:base-names {:src ["cli"], :test ["cli"]},
:lib-imports
Expand All @@ -227,7 +227,7 @@
"clojars" {:url "https://repo.clojars.org/"}},
:alias "cl",
:project-dir
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-08-10-071458.eKT8h7f4/example/projects/command-line",
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-12-08-213505.NZspK7fl/example/projects/command-line",
:lib-deps
{:src
{"org.clojure/clojure"
Expand All @@ -246,7 +246,7 @@
"slacker/slacker"
{:version "0.17.0", :type "maven", :size 28408}}},
:config-filename
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-08-10-071458.eKT8h7f4/example/projects/command-line/deps.edn",
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-12-08-213505.NZspK7fl/example/projects/command-line/deps.edn",
:component-names {:src ["user-remote"], :test ["user-remote"]},
:deps
{"cli"
Expand All @@ -273,7 +273,7 @@
"clojars" {:url "https://repo.clojars.org/"}},
:alias "user-s",
:project-dir
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-08-10-071458.eKT8h7f4/example/projects/user-service",
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-12-08-213505.NZspK7fl/example/projects/user-service",
:lib-deps
{:src
{"org.clojure/clojure"
Expand All @@ -287,7 +287,7 @@
"slacker/slacker"
{:version "0.17.0", :type "maven", :size 28408}}},
:config-filename
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-08-10-071458.eKT8h7f4/example/projects/user-service/deps.edn",
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-12-08-213505.NZspK7fl/example/projects/user-service/deps.edn",
:component-names {:src ["user"], :test ["user"]},
:deps
{"user-api"
Expand All @@ -299,7 +299,7 @@
[{:name "dev.lisa",
:namespace "dev.lisa",
:file-path
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-08-10-071458.eKT8h7f4/example/development/src/dev/lisa.clj",
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-12-08-213505.NZspK7fl/example/development/src/dev/lisa.clj",
:imports ["slacker.client"]}]},
:base-names {:src ["cli" "user-api"], :test ["cli" "user-api"]},
:lib-imports
Expand Down Expand Up @@ -328,7 +328,7 @@
"clojars" {:url "https://repo.clojars.org/"}},
:alias "dev",
:project-dir
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-08-10-071458.eKT8h7f4/example/development",
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-12-08-213505.NZspK7fl/example/development",
:unmerged
{:paths
{:src
Expand Down Expand Up @@ -362,7 +362,7 @@
"org.apache.logging.log4j/log4j-slf4j-impl"
{:version "2.13.3", :type "maven", :size 23590}}},
:config-filename
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-08-10-071458.eKT8h7f4/example/deps.edn",
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-12-08-213505.NZspK7fl/example/deps.edn",
:component-names {:src ["user"], :test ["user"]},
:deps
{"cli"
Expand All @@ -376,11 +376,11 @@
:is-git-repo true,
:branch "main",
:git-root
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-08-10-071458.eKT8h7f4/example",
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-12-08-213505.NZspK7fl/example",
:auto-add true,
:stable-since
{:tag "stable-lisa",
:sha "f387b4dcdd23c4db6219fbb8d46d8f0712c3f58c"},
:sha "d9e0fdef0e7e848f8b51ea14a80d5ee9e441b9e5"},
:polylith
{:repo "https://github.com/polyfy/polylith.git", :branch "master"}},
:top-namespace "se.example",
Expand Down Expand Up @@ -459,15 +459,15 @@
:unnamed-args []},
:version
{:release
{:name "0.2.15-alpha",
{:name "0.2.16-alpha",
:major 0,
:minor 2,
:patch 15,
:patch 16,
:revision "alpha",
:date "2022-08-10"},
:ws {:type :toolsdeps2, :breaking 1, :non-breaking 1}},
:date "2022-12-08"},
:ws {:type :toolsdeps2, :breaking 1, :non-breaking 2}},
:ws-dir
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-08-10-071458.eKT8h7f4/example",
"/private/var/folders/q7/ky18vssj6jz0mhfr8lcv1xzh0000gp/T/polylith-ws-2022-12-08-213505.NZspK7fl/example",
:ws-reader
{:name "polylith-clj",
:project-url "https://github.com/polyfy/polylith",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,5 @@ Test results: 0 passes, 0 failures, 0 errors.
Running test teardown for the teardown-fails project: project.teardown-fails.test-setup/teardown

Test teardown failed: java.lang.Exception: Teardown failed for project: teardown-fails

Execution time: 1 seconds
exit code: 0
Test terminated due to teardown failure
exit code: 1
2 changes: 1 addition & 1 deletion scripts/output/help/01-help.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Poly 0.2.16-alpha-issue254 (2022-11-04) - https://github.com/polyfy/polylith
Poly 0.2.16-alpha (2022-12-08) - https://github.com/polyfy/polylith

poly CMD [ARGS] - where CMD [ARGS] are:

Expand Down
8 changes: 4 additions & 4 deletions scripts/output/local-dep-old-format/ws.edn
Original file line number Diff line number Diff line change
Expand Up @@ -668,13 +668,13 @@
:is-no-exit false},
:version
{:release
{:name "0.2.15-alpha",
{:name "0.2.16-alpha",
:major 0,
:minor 2,
:patch 15,
:patch 16,
:revision "alpha",
:date "2022-08-10"},
:ws {:type :toolsdeps2, :breaking 1, :non-breaking 1},
:date "2022-12-08"},
:ws {:type :toolsdeps2, :breaking 1, :non-breaking 2},
:from {:ws {:type :toolsdeps1}}},
:ws-dir "/privateWS-HOME/local-dep-old-format",
:ws-reader
Expand Down
4 changes: 2 additions & 2 deletions scripts/output/local-dep/libs-compact.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
e i
library version type KB inv dev r l
---------------------------------------------------- --- --- ---
clj-time/clj-time d9ed4e4 git - x x . x
clj-time/clj-time d9ed4e4 git 133 x x . x
migrate-me/migrate-me - local 0 t t t .
org.clojure/clojure 1.10.1 maven 3,816 x x . .
org.clojure/tools.deps.alpha 0.12.985 maven 59 x x . .
uncomplicate/neanderthal 0.41.0 maven 0 - x . .
uncomplicate/neanderthal 0.41.0 maven 219 - x . .
21 changes: 9 additions & 12 deletions scripts/output/local-dep/ws.edn
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,11 @@
{"invoicing" {:src [], :test []}, "development" {:src [], :test []}},
:project-to-bricks-to-test {"development" [], "invoicing" []},
:project-to-projects-to-test {"invoicing" [], "development" []},
:since-sha "5292e8ab1bea3ff84b08c7f2142dbe7f1349a3f3",
:since-sha "SHA",
:changed-files [],
:git-diff-command
"git diff 5292e8ab1bea3ff84b08c7f2142dbe7f1349a3f3 --name-only",
:git-diff-command "git diff SHA --name-only",
:changed-components [],
:since-tag "stable-jote",
:since-tag "stable-BRANCH",
:changed-or-affected-projects []},
:components
[{:lines-of-code {:src 4, :test 6},
Expand Down Expand Up @@ -543,11 +542,9 @@
:branch "BRANCH",
:git-root "USER-HOME/source/polylith",
:auto-add false,
:stable-since
{:tag "stable-jote",
:sha "5292e8ab1bea3ff84b08c7f2142dbe7f1349a3f3"},
:stable-since {:tag "stable-BRANCH", :sha "SHA"},
:polylith
{:repo "https://github.com/polyfy/polylith.git", :branch "master"}},
{:repo "https://github.com/polyfy/polylith.git", :branch "BRANCH"}},
:tag-patterns {:stable "stable-*", :release "v[0-9]*"},
:m2-dir "USER-HOME/.m2",
:color-mode "none",
Expand Down Expand Up @@ -588,13 +585,13 @@
:is-no-exit false},
:version
{:release
{:name "0.2.15-alpha",
{:name "0.2.16-alpha",
:major 0,
:minor 2,
:patch 15,
:patch 16,
:revision "alpha",
:date "2022-08-10"},
:ws {:type :toolsdeps2, :breaking 1, :non-breaking 1}},
:date "2022-12-08"},
:ws {:type :toolsdeps2, :breaking 1, :non-breaking 2}},
:ws-dir "USER-HOME/source/polylith/examples/local-dep",
:ws-local-dir "examples/local-dep",
:ws-reader
Expand Down
2 changes: 1 addition & 1 deletion scripts/output/polylith1/info-migrated.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
tap tap --- s-- s--
test-helper test-helper --- -t- s--
test-runner-contract test-runner-contract s-- st- st-
test-runner-orchestrator test-runner-orchestrator --- s-- s--
test-runner-orchestrator test-runner-orchestrator --- st- st-
text-table text-table s-- s-- s--
user-config user-config s-- s-- s--
user-input user-input s-- st- st-
Expand Down
2 changes: 1 addition & 1 deletion scripts/output/polylith1/info.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
tap tap --- s-- s--
test-helper test-helper --- -t- s--
test-runner-contract test-runner-contract s-- st- st-
test-runner-orchestrator test-runner-orchestrator --- s-- s--
test-runner-orchestrator test-runner-orchestrator --- st- st-
text-table text-table s-- s-- s--
user-config user-config s-- s-- s--
user-input user-input s-- st- st-
Expand Down
10 changes: 5 additions & 5 deletions scripts/output/polylith1/libs-migrated.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
library version type KB api poly dev s e r l p r j r
--------------------------------------------------------- --------- --- ----------------------
clj-commons/fs 1.6.310 maven 12 x x x . x . . . . . .
djblue/portal 0.26.0 maven 1,136 - x x . . . . x . . .
io.github.seancorfield/build-clj 0ffdb4c git 41 - - x . . . . . . . .
metosin/malli 0.8.4 maven 63 x x x . . . . . x . .
djblue/portal 0.33.0 maven 1,150 - x x . . . . x . . .
io.github.seancorfield/build-clj 7ac1f8d git 41 - - x . . . . . . . .
metosin/malli 0.9.2 maven 73 x x x . . . . . x . .
mount/mount 0.1.16 maven 8 - - x . . . . . . . .
mvxcvi/puget 1.3.2 maven 15 x x x . . . . . . . x
org.clojure/clojure 1.11.1 maven 4,008 x x x . . . . . . . .
org.clojure/tools.deps.alpha 0.14.1205 maven 64 x x x x x . . . . x .
org.clojure/tools.deps.alpha 0.15.1244 maven 64 x x x x x . . . . x .
org.jline/jline 3.21.0 maven 971 - x x . . . x . . . .
org.slf4j/slf4j-nop 1.7.36 maven 3 - x x . . . . . . . .
org.slf4j/slf4j-nop 2.0.3 maven 3 - x x . . . . . . . .
rewrite-clj/rewrite-clj 1.1.45 maven 71 - - x . . . . . . . .
slipset/deps-deploy 0.2.0 maven 7 - - x . . . . . . . .
zprint/zprint 1.2.4 maven 185 - x x . . x . . . . .
Loading

0 comments on commit 441e710

Please sign in to comment.