Ch156 (Clojure): prep for challenge

8 files changed, 57 insertions, 9 deletions

diff --git a/challenge-156/tyler-wardhaugh/clojure/README.md b/challenge-156/tyler-wardhaugh/clojure/README.md
index 0172d72218..e86eb6e777 100644
--- a/challenge-156/tyler-wardhaugh/clojure/README.md
+++ b/challenge-156/tyler-wardhaugh/clojure/README.md
@@ -1,6 +1,6 @@
 # c154
 
-The Weekly Challenge — #154 — Tyler Wardhaugh
+The Weekly Challenge — #156 — Tyler Wardhaugh
 
 ## Usage
 
@@ -12,14 +12,17 @@ Run Task #1:
     # ... or ...
     $ bb run task-1
 
+    # Alternatively, to run it via Babashka:
+    $ bb run task-1-bb
+
 Run Task #2:
 
-    $ clojure -M:t2
+    $ clojure -M:t2 N
     # ... or ...
-    $ bb run task-2
+    $ bb run task-2 N
 
     # Alternatively, to run it via Babashka:
-    $ bb run task-2-bb
+    $ bb run task-2-bb N
 
 Run the project's tests (which are samples from the task descriptions):
 
diff --git a/challenge-156/tyler-wardhaugh/clojure/bb.edn b/challenge-156/tyler-wardhaugh/clojure/bb.edn
index 6d0b679197..e21cd63a1e 100644
--- a/challenge-156/tyler-wardhaugh/clojure/bb.edn
+++ b/challenge-156/tyler-wardhaugh/clojure/bb.edn
@@ -72,7 +72,7 @@
           :task (run-task-clj :t1 *command-line-args*)}
 
   task-1-bb {:doc "Run Task 1 (via Babashka)"
-             :task (bb-no-go :t1 *command-line-args*)}
+             :task (run-task-bb :t1 *command-line-args*)}
 
   task-2 {:doc "Run Task 2 (via clojure)"
           :task (run-task-clj :t2 *command-line-args*)}
diff --git a/challenge-156/tyler-wardhaugh/clojure/build.clj b/challenge-156/tyler-wardhaugh/clojure/build.clj
new file mode 100644
index 0000000000..937053b000
--- /dev/null
+++ b/challenge-156/tyler-wardhaugh/clojure/build.clj
@@ -0,0 +1,19 @@
+(ns build
+  (:refer-clojure :exclude [test])
+  (:require [org.corfield.build :as bb]))
+
+(def lib 'net.clojars.c156/c156)
+(def version "0.1.0-SNAPSHOT")
+(def main 'c156.c156)
+
+(defn test "Run the tests." [opts]
+  (bb/run-tests opts))
+
+(def clean bb/clean)
+
+(defn ci "Run the CI pipeline of tests (and build the uberjar)." [opts]
+  (-> opts
+      (assoc :lib lib :version version :main main)
+      (bb/run-tests)
+      (bb/clean)
+      (bb/uber)))
diff --git a/challenge-156/tyler-wardhaugh/clojure/deps.edn b/challenge-156/tyler-wardhaugh/clojure/deps.edn
index d647404dd7..616765131d 100644
--- a/challenge-156/tyler-wardhaugh/clojure/deps.edn
+++ b/challenge-156/tyler-wardhaugh/clojure/deps.edn
@@ -1,9 +1,8 @@
 {:paths ["src" "resources"]
- :deps {org.clojure/clojure {:mvn/version "1.11.0-rc1"}
-        org.clojure/math.combinatorics {:mvn/version "0.1.6"}}
+ :deps {org.clojure/clojure {:mvn/version "1.11.0-rc1"}}
  :aliases
- {:t1 {:main-opts ["-m" "c154.t1"]}
-  :t2 {:main-opts ["-m" "c154.t2"]}
+ {:t1 {:main-opts ["-m" "c156.t1"]}
+  :t2 {:main-opts ["-m" "c156.t2"]}
   :build {:deps {io.github.seancorfield/build-clj
                  {:git/tag "v0.6.3" :git/sha "9b8e09b"
                   ;; since we're building an app uberjar, we do not
diff --git a/challenge-156/tyler-wardhaugh/clojure/src/c156/t1.clj b/challenge-156/tyler-wardhaugh/clojure/src/c156/t1.clj
new file mode 100644
index 0000000000..c7c7c09117
--- /dev/null
+++ b/challenge-156/tyler-wardhaugh/clojure/src/c156/t1.clj
@@ -0,0 +1,6 @@
+(ns c156.t1
+  (:require [clojure.pprint :refer [cl-format]]))
+
+(defn -main
+  "Run Task 1."
+  [& args])
diff --git a/challenge-156/tyler-wardhaugh/clojure/src/c156/t2.clj b/challenge-156/tyler-wardhaugh/clojure/src/c156/t2.clj
new file mode 100644
index 0000000000..ef367a1124
--- /dev/null
+++ b/challenge-156/tyler-wardhaugh/clojure/src/c156/t2.clj
@@ -0,0 +1,7 @@
+(ns c156.t2
+  (:require [clojure.pprint :refer [cl-format]]))
+
+(defn -main
+  "Run Task 2 with a given input N, defaulting to the first example from the
+  task description."
+  [& args])
diff --git a/challenge-156/tyler-wardhaugh/clojure/test/c156/t1_test.clj b/challenge-156/tyler-wardhaugh/clojure/test/c156/t1_test.clj
new file mode 100644
index 0000000000..fb4361c2c7
--- /dev/null
+++ b/challenge-156/tyler-wardhaugh/clojure/test/c156/t1_test.clj
@@ -0,0 +1,7 @@
+(ns c156.t1-test
+  (:require [clojure.test :refer [deftest is testing]]
+            [c156.t1 :as t1]))
+
+(deftest task-1
+  (testing "Task 1 produces the correct result"
+    ))
diff --git a/challenge-156/tyler-wardhaugh/clojure/test/c156/t2_test.clj b/challenge-156/tyler-wardhaugh/clojure/test/c156/t2_test.clj
new file mode 100644
index 0000000000..0c8409a741
--- /dev/null
+++ b/challenge-156/tyler-wardhaugh/clojure/test/c156/t2_test.clj
@@ -0,0 +1,7 @@
+(ns c156.t2-test
+  (:require [clojure.test :refer [deftest is testing]]
+            [c156.t2 :as t2]))
+
+(deftest task-2
+  (testing "Task 2 produces the correct result"
+    ))