feat: publisher에서 configuration을 씀

doerg/src/net/deertopia/doerg/config.clj

@@ -14,13 +14,10 @@
                 ::d/doerg-parser]))
 
 (s/def ::d/directory
-  (s/conformer #(if-some [x (fs/file %)]
-                  (if (fs/directory? x) x ::s/invalid)
-                  ::s/invalid)))
+  (s/conformer #(fs/file %)))
 
 (s/def ::d/file
-  (s/conformer #(or (-> % fs/file fs/expand-home fs/absolutize)
-                    ::s/invalid)))
+  (s/conformer #(-> % fs/expand-home fs/file)))
 
 (s/def ::d/executable
   (s/conformer
@@ -44,12 +41,25 @@
            (and (fs/exists? x) x))
         (fs/split-paths (System/getenv "XDG_DATA_DIRS"))))
 
-(defn read-config [f]
-  (->> f aero/read-config (s/conform ::d/config)))
+(defn make-read-config [spec]
+  (fn [& files]
+    (let [r (->> files
+                 (filter identity)
+                 (map aero/read-config)
+                 (apply merge))
+          conformed (s/conform spec r)]
+      (if-not (s/invalid? conformed)
+        conformed
+        (throw (IllegalArgumentException.
+                "bad config"
+                (ex-info "couldn't conform"
+                         (s/explain-data spec r))))))))
+
+(def read-config (make-read-config ::d/config))
 
 (def default
-  (let [r (->> "net/deertopia/doerg/config.edn"
-               io/resource read-config)]
+  (let [r (-> "net/deertopia/doerg/config.edn"
+              io/resource (read-config (System/getenv "DOERG_CONFIG")))]
     (if (s/invalid? r)
       (throw (IllegalArgumentException.
               "default config is bad!"))