refactor: doerg는 publisher와 결합

publisher/deps.edn

@@ -8,7 +8,7 @@
         org.xerial/sqlite-jdbc {:mvn/version "3.47.1.0"}
         cheshire/cheshire {:mvn/version "6.1.0"}
         org.clojure/test.check {:mvn/version "1.1.3"}
-        net.deertopia/doerg {:local/root "../doerg"}
+        net.deertopia/doerg {:local/root ".."}
         metosin/reitit {:mvn/version "0.10.1"}
         http-kit/http-kit {:mvn/version "2.8.0"}
         instaparse/instaparse {:mvn/version "1.5.0"}

publisher/resources/net/deertopia/publisher/elisp/grammar

@@ -1,30 +0,0 @@
-<file> ::= elements
-
-<elements> ::= ws? element ws? elements
-            |  ws? ε
-
-<element> ::= string
-           |  list
-           |  symbol
-           |  integer
-           |  property-string
-
-string ::= <'"'> #'([^"\\]|\\.|\\\n)*' <'"'>
-
-property-string
-  ::= <'#('> ws? string text-property* ws? <')'>
-
-text-property ::= ws? element ws? element ws? element
-
-list ::= <'('> elements dot-cdr? <')'>
-
-symbol ::= #'([^?#0-9 \n\s\f()\[\]"\'\\.]|\\.)([^ \n\s\f()\[\]"\'\\]|\\.)*'
-        |  #'\.([^ \n\s\f()\[\]"\'\\]|\\.)+'
-
-integer ::= #'[-+]?[0-9]+' <#'.'>?
-
-dot-cdr ::= <'.'> ws? element
-
-<text> ::= ws? (string | property-string) ws?
-
-<ws> ::= <#'(\s||\n)'>+

publisher/src/net/deertopia/publisher/config.clj

@@ -3,7 +3,6 @@
             [clojure.spec.alpha :as s]
             [net.deertopia.doerg.config :as doerg-config]
             [net.deertopia.doerg :as-alias doerg]
-            [net.deertopia.publisher :as-alias p]
             [aero.core :as aero]
             [clojure.java.io :as io]))
 

publisher/test/net/deertopia/publisher/roam_test.clj

@@ -1,26 +1,25 @@
-(ns net.deertopia.publisher.roam-test
-  (:require [net.deertopia.publisher.roam :as sut]
+(ns net.deertopia.doerg.roam-test
+  (:require [net.deertopia.doerg.roam :as sut]
             [clojure.test :as t]
             [clojure.java.io :as io]
-            [net.deertopia.publisher.config :as publisher-cfg]
-            [net.deertopia.publisher :as-alias publisher]
+            [net.deertopia.doerg.config :as cfg]
             [babashka.fs :as fs]
             [babashka.process :as p]
-            [net.deertopia.publisher.config-test :refer [test-config-fixture]]
+            [net.deertopia.doerg.config-test :refer [test-config-fixture]]
             [next.jdbc :as sql]
             [clojure.string :as str]
-            [net.deertopia.publisher.elisp :as elisp]
+            [net.deertopia.doerg.elisp :as elisp]
             [com.rpl.specter :as sp]))
 
 (def org-roam-directory
-  (fs/file "test/net/deertopia/publisher/roam-test"))
+  (fs/file "test/net/deertopia/doerg/roam-test"))
 
 (defn org-roam-db-sync [db-file]
   (let [script-file (fs/create-temp-file {:prefix "org-roam-db-sync-"
                                           :suffix ".el"})
         emacs (->> [(System/getenv "EMACS") "test-emacs" "emacs"]
                    (some #(some-> % fs/which)))]
-    (io/copy (-> "net/deertopia/publisher/org-roam-db-sync.el"
+    (io/copy (-> "net/deertopia/doerg/org-roam-db-sync.el"
                  io/resource io/reader)
              (fs/file script-file))
     (p/shell {:out :string :err :string}
@@ -28,7 +27,7 @@
     (fs/delete script-file)))
 
 (defn test-db-fixture [f]
-  (let [db-file (-> publisher-cfg/*cfg* ::publisher/org-roam-db-path)]
+  (let [db-file (-> cfg/*cfg* ::cfg/org-roam-db-path)]
     (assert (->> db-file fs/canonicalize str
                  (re-matches #"^/(build|tmp)/.*"))
             (format "i'm scared to delete a non-test database... %s"