Ch126: prep for challenge

8 files changed, 65 insertions, 29 deletions

diff --git a/challenge-126/tyler-wardhaugh/clojure/README.md b/challenge-126/tyler-wardhaugh/clojure/README.md
index 83da1a729e..118d7b558d 100644
--- a/challenge-126/tyler-wardhaugh/clojure/README.md
+++ b/challenge-126/tyler-wardhaugh/clojure/README.md
@@ -1,7 +1,7 @@
-# tw.weekly.c120
+# tw.weekly.c126
 
 
-The Weekly Challenge - #120 - Tyler Wardhaugh
+The Weekly Challenge - #126 - Tyler Wardhaugh
 
 ## Usage
 
@@ -9,7 +9,7 @@ Clojure ([installation instructions](https://clojure.org/guides/getting_started#
 
 Run the project directly (shows default output from both tasks):
 
-    $ clojure -M -m tw.weekly.c120.core
+    $ clojure -M -m tw.weekly.c126.core
     # ... or ...
     $ bb run both
 
@@ -21,15 +21,15 @@ Run the project's tests (which are samples from the task descriptions):
 
 Run Task #1 with input
 
-    $ clojure -M -m tw.weekly.c120.t1 N
+    $ clojure -M -m tw.weekly.c126.t1 N
     # ... or ...
     $ bb run task-1 N
 
 Run Task #2 with input:
 
-    $ clojure -M -m tw.weekly.c120.t2 T
+    $ clojure -M -m tw.weekly.c126.t2
     # ... or ...
-    $ bb run task-2 T
+    $ bb run task-2
 
 View available tasks Babashka can run:
 
diff --git a/challenge-126/tyler-wardhaugh/clojure/bb.edn b/challenge-126/tyler-wardhaugh/clojure/bb.edn
index d6814eab4a..0c49645ba4 100644
--- a/challenge-126/tyler-wardhaugh/clojure/bb.edn
+++ b/challenge-126/tyler-wardhaugh/clojure/bb.edn
@@ -55,7 +55,7 @@
                        p/check))}
 
   test {:doc "Run tests"
-        :task (clojure "-M:test:runner")}
+        :task (clojure "-X:test")}
 
   c**** {:doc "CHALLENGE TASKS"}
 
diff --git a/challenge-126/tyler-wardhaugh/clojure/deps.edn b/challenge-126/tyler-wardhaugh/clojure/deps.edn
index db7a47ac68..5b1400b27e 100644
--- a/challenge-126/tyler-wardhaugh/clojure/deps.edn
+++ b/challenge-126/tyler-wardhaugh/clojure/deps.edn
@@ -1,19 +1,14 @@
 {:paths ["src" "resources"]
- :deps {org.clojure/clojure {:mvn/version "1.10.3"}
-        org.clojure/math.numeric-tower {:mvn/version "0.0.4"}}
+ :deps {org.clojure/clojure {:mvn/version "1.10.3"}}
  :aliases
- {:test
-  {:extra-paths ["test"]
-   :extra-deps {org.clojure/test.check {:mvn/version "1.0.0"}}}
-
-  :runner
-  {:extra-deps {com.cognitect/test-runner
-                {:git/url "https://github.com/cognitect-labs/test-runner"
-                 :sha "705ad25bbf0228b1c38d0244a36001c2987d7337"}}
-   :main-opts ["-m" "cognitect.test-runner"
-               "-d" "test"]}
-
-  :jar
-  {:replace-deps {com.github.seancorfield/depstar {:mvn/version "2.0.216"}}
-   :exec-fn hf.depstar/jar
-   :exec-args {:jar "tw-weekly.jar" :sync-pom true}}}}
+ {:test {:extra-paths ["test"]
+         :extra-deps {org.clojure/test.check {:mvn/version "1.1.0"}
+                      io.github.cognitect-labs/test-runner
+                      {:git/url "https://github.com/cognitect-labs/test-runner"
+                       :sha "62ef1de18e076903374306060ac0e8a752e57c86"}}
+         :exec-fn cognitect.test-runner.api/test}
+  :jar {:replace-deps {com.github.seancorfield/depstar {:mvn/version "2.1.278"}}
+        :exec-fn hf.depstar/uberjar
+        :exec-args {:aot true
+                    :jar "tw-weekly.jar"
+                    :sync-pom true}}}}
diff --git a/challenge-126/tyler-wardhaugh/clojure/pom.xml b/challenge-126/tyler-wardhaugh/clojure/pom.xml
index ed18485e7e..16891bbc7c 100644
--- a/challenge-126/tyler-wardhaugh/clojure/pom.xml
+++ b/challenge-126/tyler-wardhaugh/clojure/pom.xml
@@ -24,11 +24,6 @@
       <artifactId>clojure</artifactId>
       <version>1.10.3</version>
     </dependency>
-    <dependency>
-      <groupId>org.clojure</groupId>
-      <artifactId>math.numeric-tower</artifactId>
-      <version>0.0.4</version>
-    </dependency>
   </dependencies>
   <build>
     <sourceDirectory>src</sourceDirectory>
diff --git a/challenge-126/tyler-wardhaugh/clojure/src/tw/weekly/c126/core.clj b/challenge-126/tyler-wardhaugh/clojure/src/tw/weekly/c126/core.clj
new file mode 100644
index 0000000000..0a8a8dd20e
--- /dev/null
+++ b/challenge-126/tyler-wardhaugh/clojure/src/tw/weekly/c126/core.clj
@@ -0,0 +1,12 @@
+(ns tw.weekly.c126.core
+  (:require [tw.weekly.c126.t1 :as t1])
+  (:require [tw.weekly.c126.t2 :as t2])
+  (:gen-class))
+
+(defn -main
+  "Run all tasks"
+  [& _]
+  (println "Task #1:")
+  (t1/-main)
+  (println "\nTask #2:")
+  (t2/-main))
diff --git a/challenge-126/tyler-wardhaugh/clojure/src/tw/weekly/c126/t1.clj b/challenge-126/tyler-wardhaugh/clojure/src/tw/weekly/c126/t1.clj
new file mode 100644
index 0000000000..fb03cd9b88
--- /dev/null
+++ b/challenge-126/tyler-wardhaugh/clojure/src/tw/weekly/c126/t1.clj
@@ -0,0 +1,14 @@
+(ns tw.weekly.c126.t1
+  (:require [clojure.edn :as edn]))
+
+;;;
+; Task description for TASK #1 › Count Numbers
+;;;
+(def DEFAULT-INPUT [])
+
+(defn -main
+  "Run Task 1 with a given input N, defaulting to the first example from the
+  task description."
+  [& args]
+  (let [[N] (or (some->> args (map edn/read-string)) DEFAULT-INPUT)]
+    ))
diff --git a/challenge-126/tyler-wardhaugh/clojure/src/tw/weekly/c126/t2.clj b/challenge-126/tyler-wardhaugh/clojure/src/tw/weekly/c126/t2.clj
new file mode 100644
index 0000000000..2861e120b7
--- /dev/null
+++ b/challenge-126/tyler-wardhaugh/clojure/src/tw/weekly/c126/t2.clj
@@ -0,0 +1,16 @@
+(ns tw.weekly.c126.t2
+  (:require [clojure.edn :as edn]
+            [clojure.string :as str]
+            [clojure.math.numeric-tower :refer [abs]]))
+
+;;;
+; Task description for TASK #2 › Clock Angle
+;;;
+(def DEFAULT-INPUT [])
+
+(defn -main
+  "Run Task 2 with a given input N, defaulting to the first example from the
+  task description."
+  [& args]
+  (let [[T] (or args DEFAULT-INPUT)]
+    ))
diff --git a/challenge-126/tyler-wardhaugh/clojure/test/tw/weekly/c126_test.clj b/challenge-126/tyler-wardhaugh/clojure/test/tw/weekly/c126_test.clj
new file mode 100644
index 0000000000..e234c0c841
--- /dev/null
+++ b/challenge-126/tyler-wardhaugh/clojure/test/tw/weekly/c126_test.clj
@@ -0,0 +1,4 @@
+(ns tw.weekly.c126-test
+  (:require [clojure.test :refer [deftest is testing]]
+            #_[tw.weekly.c126.t1 :refer []]
+            #_[tw.weekly.c126.t2 :refer []]))