Small improvements (#951)

Makefile

@@ -7,7 +7,7 @@ generate: clean
 clean:
 	rm -rf issues/*
 
-format:
+fix-format:
 	clojure -M:cljfmt-fix
 
 checks: check-format check-namespaces check-style check-kondo

deps.edn

@@ -13,7 +13,7 @@
         faker/faker {:mvn/version "0.3.2"}
         kovacnica/clojure.network.ip {:mvn/version "0.1.3"}}
  :aliases {:test {:extra-paths ["test"]
-                  :extra-deps  {lambdaisland/kaocha {:mvn/version "1.67.1055"}}
+                  :extra-deps  {lambdaisland/kaocha {:mvn/version "1.68.1059"}}
                   :main-opts   ["-m" "kaocha.runner"]}
            :eastwood {:main-opts ["-m"
                                   "eastwood.lint"

src/battle_asserts/core.clj

@@ -22,8 +22,7 @@
   (let [generator (build-generator)
         size (count samples)
         coll (gen/sample generator (- max-asserts size))
-        generated (map #(hash-map :expected (apply solution %) :arguments %)
-                       coll)]
+        generated (map #(hash-map :expected (apply solution %) :arguments %) coll)]
     (reduce
      (fn [acc task] (conj acc (into (sorted-map) task)))
      generated
@@ -51,9 +50,7 @@
 (defn generate-issues
   [issue-ns-name]
   (require [issue-ns-name])
-  (let [issue-name (s/replace (last (s/split (str issue-ns-name) #"\."))
-                              #"-"
-                              "_")
+  (let [issue-name (s/replace (last (s/split (str issue-ns-name) #"\.")) #"-" "_")
         build-generator (ns-resolve issue-ns-name 'arguments-generator)
         solution (ns-resolve issue-ns-name 'solution)
         disabled (ns-resolve issue-ns-name 'disabled)

src/battle_asserts/issues/students_discipline_count.clj

@@ -2,7 +2,7 @@
   (:require [clojure.test.check.generators :as gen]
             [clojure.string :as s]
             [faker.generate :as faker]
-            [faker.name :as f]))
+            [battle-asserts.utility :as util]))
 
 (def level :elementary)
 
@@ -21,7 +21,7 @@
    :output {:type {:name "hash" :nested {:name "integer"}}}})
 
 (defn arguments-generator []
-  (letfn [(student-name [] (s/join " " [(f/first-name) (f/last-name)]))
+  (letfn [(student-name [] (util/gen-name))
           (student-names [] (repeatedly 30 student-name))
           (student-disciplines [] (conj (map s/capitalize (repeatedly 3 faker/word)) "Chemistry" "Jedi" "Magic" "Programming" "Dance" "Biology"))
           (student-info-gen [] (gen/generate (gen/hash-map :student-name (gen/elements (student-names)) :discipline (gen/elements (student-disciplines)))))]

src/battle_asserts/issues/students_name_slugify.clj

@@ -2,7 +2,7 @@
   (:require [clojure.test.check.generators :as gen]
             [clojure.string :as s]
             [faker.generate :as faker]
-            [faker.name :as f]))
+            [battle-asserts.utility :as util]))
 
 (def level :elementary)
 
@@ -19,7 +19,7 @@
    :output {:type {:name "array" :nested {:name "string"}}}})
 
 (defn arguments-generator []
-  (letfn [(student-name [] (s/join " " [(f/first-name) (f/last-name)]))
+  (letfn [(student-name [] (util/gen-name))
           (student-names [] (repeatedly 40 student-name))
           (student-disciplines [] (conj (map s/capitalize (repeatedly 10 faker/word)) "Chemistry" "Jedi" "Magic" "Programming" "Dance" "Biology"))
           (student-info-gen [] (gen/generate (gen/hash-map :student-name (gen/elements (student-names)) :discipline (gen/elements (student-disciplines)))))]

src/battle_asserts/utility_tools.clj

@@ -9,9 +9,7 @@
       nsf/find-namespaces-in-dir))
 
 (defn- prepare-namespace-name [namespace]
-  (s/replace (last (s/split (str namespace) #"\."))
-             #"-"
-             "_"))
+  (s/replace (last (s/split (str namespace) #"\.")) #"-" "_"))
 
 (defn- present-untraslated-tasks [task-list level]
   (if (empty? task-list)
@@ -129,3 +127,9 @@
     (if (empty? @disabled-list)
       (println "There is no disabled tasks! Yaay!")
       (println (str "Disabled tasks list:\n" (s/join ", " @disabled-list) "\nTotal number of disabled tasks is: " (count @disabled-list) "!")))))
+
+; TODO implement tool for issue generating
+(defn generate-isssue-template
+  "Tool that generates issue template"
+  [& _args]
+  (println "Not implemented yet!"))