renaming namespace to cumulo-util

Cumulo · Dec 9, 2018 · 5426512 · 5426512
1 parent 4f1002c
commit 5426512
Show file tree

Hide file tree

Showing 26 changed files with 456 additions and 406 deletions.
diff --git a/calcit.edn b/calcit.edn
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "md5": "^2.2.1",
     "randomcolor": "^0.5.3",
     "shortid": "^2.2.14",
-    "ws": "^6.1.0"
+    "ws": "^6.1.2"
   },
   "devDependencies": {
     "http-server": "^0.11.1",

diff --git a/shadow-cljs.edn b/shadow-cljs.edn
@@ -17,19 +17,19 @@
  :builds {:client {:output-dir "target/"
                    :asset-path "./"
                    :target :browser
-                   :modules {:client {:init-fn app.client/main!}}
-                   :devtools {:after-load app.client/reload!
+                   :modules {:client {:init-fn cumulo-util.client/main!}}
+                   :devtools {:after-load cumulo-util.client/reload!
                               :http-root "target"
                               :http-port 7000}
                    :release {:output-dir "dist/"}
                              :module-hash-names 8
                              :build-options {:manifest-name "assets.edn"}}
           :page {:target :node-script
                  :output-to "target/page.js"
-                 :main app.page/main!
-                 :devtools {:after-load app.page/main!}}
+                 :main cumulo-util.page/main!
+                 :devtools {:after-load cumulo-util.page/main!}}
           :server {:target :node-script
                    :output-to "target/server.js"
-                   :main app.server/main!
-                   :devtools {:after-load app.server/reload!}
+                   :main cumulo-util.server/main!
+                   :devtools {:after-load cumulo-util.server/reload!}
                    :release {:output-to "dist/server.js"}}}}
diff --git a/src/app/twig/user.cljs b/src/app/twig/user.cljs
diff --git a/src/app/util.cljs b/src/app/util.cljs
diff --git a/src/app/client.cljs → src/cumulo_util/client.cljs b/src/app/client.cljs → src/cumulo_util/client.cljs
@@ -1,12 +1,12 @@
 
-(ns app.client
+(ns cumulo-util.client
   (:require [respo.core :refer [render! clear-cache! realize-ssr!]]
             [respo.cursor :refer [mutate]]
-            [app.comp.container :refer [comp-container]]
+            [cumulo-util.comp.container :refer [comp-container]]
             [cljs.reader :refer [read-string]]
-            [app.connection :refer [send! setup-socket!]]
-            [app.schema :as schema]
-            [app.config :as config]))
+            [cumulo-util.connection :refer [send! setup-socket!]]
+            [cumulo-util.schema :as schema]
+            [cumulo-util.config :as config]))
 
 (declare dispatch!)
 

diff --git a/src/app/comp/container.cljs → src/cumulo_util/comp/container.cljs b/src/app/comp/container.cljs → src/cumulo_util/comp/container.cljs
@@ -1,18 +1,18 @@
 
-(ns app.comp.container
+(ns cumulo-util.comp.container
   (:require [hsl.core :refer [hsl]]
             [respo-ui.core :as ui]
             [respo.core :refer [defcomp <> div span action-> cursor-> button]]
             [respo.comp.inspect :refer [comp-inspect]]
             [respo.comp.space :refer [=<]]
-            [app.comp.navigation :refer [comp-navigation]]
-            [app.comp.profile :refer [comp-profile]]
-            [app.comp.login :refer [comp-login]]
+            [cumulo-util.comp.navigation :refer [comp-navigation]]
+            [cumulo-util.comp.profile :refer [comp-profile]]
+            [cumulo-util.comp.login :refer [comp-login]]
             [respo-message.comp.messages :refer [comp-messages]]
             [cumulo-reel.comp.reel :refer [comp-reel]]
-            [app.config :refer [dev?]]
-            [app.schema :as schema]
-            [app.config :as config]))
+            [cumulo-util.config :refer [dev?]]
+            [cumulo-util.schema :as schema]
+            [cumulo-util.config :as config]))
 
 (defcomp
  comp-offline

diff --git a/src/app/comp/login.cljs → src/cumulo_util/comp/login.cljs b/src/app/comp/login.cljs → src/cumulo_util/comp/login.cljs
@@ -1,12 +1,12 @@
 
-(ns app.comp.login
+(ns cumulo-util.comp.login
   (:require [respo.core :refer [defcomp <> div input button span]]
             [respo.comp.space :refer [=<]]
             [respo.comp.inspect :refer [comp-inspect]]
             [respo-ui.core :as ui]
-            [app.schema :as schema]
-            [app.style :as style]
-            [app.config :as config]))
+            [cumulo-util.schema :as schema]
+            [cumulo-util.style :as style]
+            [cumulo-util.config :as config]))
 
 (def initial-state {:username "", :password ""})
 

diff --git a/src/app/comp/navigation.cljs → src/cumulo_util/comp/navigation.cljs b/src/app/comp/navigation.cljs → src/cumulo_util/comp/navigation.cljs
@@ -1,10 +1,10 @@
 
-(ns app.comp.navigation
+(ns cumulo-util.comp.navigation
   (:require [hsl.core :refer [hsl]]
             [respo-ui.core :as ui]
             [respo.comp.space :refer [=<]]
             [respo.core :refer [defcomp <> action-> span div]]
-            [app.config :as config]))
+            [cumulo-util.config :as config]))
 
 (defcomp
  comp-navigation

diff --git a/src/app/comp/profile.cljs → src/cumulo_util/comp/profile.cljs b/src/app/comp/profile.cljs → src/cumulo_util/comp/profile.cljs
@@ -1,11 +1,11 @@
 
-(ns app.comp.profile
+(ns cumulo-util.comp.profile
   (:require [hsl.core :refer [hsl]]
-            [app.schema :as schema]
+            [cumulo-util.schema :as schema]
             [respo-ui.core :as ui]
             [respo.core :refer [defcomp list-> <> span div button]]
             [respo.comp.space :refer [=<]]
-            [app.config :as config]))
+            [cumulo-util.config :as config]))
 
 (defcomp
  comp-profile

diff --git a/src/app/config.cljs → src/cumulo_util/config.cljs b/src/app/config.cljs → src/cumulo_util/config.cljs
@@ -1,5 +1,5 @@
 
-(ns app.config (:require [app.util :refer [get-env!]]))
+(ns cumulo-util.config (:require [cumulo-util.core :refer [get-env!]]))
 
 (def bundle-builds #{"release" "local-bundle"})
 

diff --git a/src/app/connection.cljs → src/cumulo_util/connection.cljs b/src/app/connection.cljs → src/cumulo_util/connection.cljs
@@ -1,5 +1,5 @@
 
-(ns app.connection
+(ns cumulo-util.connection
   (:require [cljs.reader :as reader] [recollect.patch :refer [patch-twig]]))
 
 (defonce *global-ws (atom nil))

diff --git a/src/cumulo_util/core.cljs b/src/cumulo_util/core.cljs
@@ -0,0 +1,18 @@
+
+(ns cumulo-util.core (:require ["path" :as path] ["fs" :as fs] ["child_process" :as cp]))
+
+(defn detect-then-write! [file-path content]
+  (let [do-write! (fn []
+                    (cp/execSync (str "mkdir -p " (path/dirname file-path)))
+                    (fs/writeFileSync file-path content)
+                    (println "Write to file:" file-path))]
+    (if (fs/existsSync file-path)
+      (let [old-content (fs/readFileSync file-path "utf8")]
+        (if (not= content old-content)
+          (do-write!)
+          (comment println "same file, skipping:" file-path)))
+      (do-write!))))
+
+(defn find-first [f xs] (reduce (fn [_ x] (when (f x) (reduced x))) nil xs))
+
+(defn get-env! [property] (aget (.-env js/process) property))
diff --git a/src/app/node_config.cljs → src/cumulo_util/node_config.cljs b/src/app/node_config.cljs → src/cumulo_util/node_config.cljs
@@ -1,5 +1,5 @@
 
-(ns app.node-config (:require ["path" :as path] [app.config :as config]))
+(ns cumulo-util.node-config (:require ["path" :as path] [cumulo-util.config :as config]))
 
 (def dev? (do ^boolean js/goog.DEBUG))
 

diff --git a/src/app/page.cljs → src/cumulo_util/page.cljs b/src/app/page.cljs → src/cumulo_util/page.cljs
@@ -1,12 +1,12 @@
 
-(ns app.page
+(ns cumulo-util.page
   (:require [respo.render.html :refer [make-string]]
             [shell-page.core :refer [make-page spit slurp]]
-            [app.comp.container :refer [comp-container]]
+            [cumulo-util.comp.container :refer [comp-container]]
             [cljs.reader :refer [read-string]]
-            [app.schema :as schema]
-            [app.config :as config]
-            [app.util :refer [get-env!]]
+            [cumulo-util.schema :as schema]
+            [cumulo-util.config :as config]
+            [cumulo-util.core :refer [get-env!]]
             [build.util :refer [get-ip!]])
   (:require-macros [clojure.core.strint :refer [<<]]))
 

diff --git a/src/app/schema.cljs → src/cumulo_util/schema.cljs b/src/app/schema.cljs → src/cumulo_util/schema.cljs
@@ -1,5 +1,5 @@
 
-(ns app.schema )
+(ns cumulo-util.schema )
 
 (def router {:name nil, :title nil, :data {}, :router nil})
 

diff --git a/src/app/server.cljs → src/cumulo_util/server.cljs b/src/app/server.cljs → src/cumulo_util/server.cljs
@@ -1,17 +1,18 @@
 
-(ns app.server
-  (:require [app.schema :as schema]
-            [app.service :refer [run-server! sync-clients!]]
-            [app.updater :refer [updater]]
+(ns cumulo-util.server
+  (:require [cumulo-util.schema :as schema]
+            [cumulo-util.service :refer [run-server! sync-clients!]]
+            [cumulo-util.updater :refer [updater]]
             [cljs.reader :refer [read-string]]
             [cumulo-reel.reel :refer [reel-reducer refresh-reel reel-schema]]
             ["fs" :as fs]
             ["shortid" :as shortid]
             ["child_process" :as cp]
             ["path" :as path]
-            [app.node-config :as node-config]
-            [app.node-config :refer [dev?]]
-            [app.config :as config]))
+            [cumulo-util.node-config :as node-config]
+            [cumulo-util.node-config :refer [dev?]]
+            [cumulo-util.config :as config]
+            [cumulo-util.core :refer [detect-then-write!]]))
 
 (def initial-db
   (let [filepath (:storage-path node-config/env)]
@@ -25,18 +26,6 @@
 
 (defonce *reader-reel (atom @*reel))
 
-(defn detect-then-write! [file-path content]
-  (let [do-write! (fn []
-                    (cp/execSync (str "mkdir -p " (path/dirname file-path)))
-                    (fs/writeFileSync file-path content)
-                    (println "Write to file:" file-path))]
-    (if (fs/existsSync file-path)
-      (let [old-content (fs/readFileSync file-path "utf8")]
-        (if (not= content old-content)
-          (do-write!)
-          (comment println "same file, skipping:" file-path)))
-      (do-write!))))
-
 (defn persist-db! []
   (let [file-content (pr-str (assoc (:db @*reel) :sessions {}))
         now (js/Date.)

diff --git a/src/app/service.cljs → src/cumulo_util/service.cljs b/src/app/service.cljs → src/cumulo_util/service.cljs
@@ -1,8 +1,8 @@
 
-(ns app.service
+(ns cumulo-util.service
   (:require [cljs.nodejs :as nodejs]
             [cljs.reader :as reader]
-            [app.twig.container :refer [twig-container]]
+            [cumulo-util.twig.container :refer [twig-container]]
             [recollect.diff :refer [diff-twig]]
             [recollect.twig :refer [render-twig]]
             ["shortid" :as shortid]

diff --git a/src/app/style.cljs → src/cumulo_util/style.cljs b/src/app/style.cljs → src/cumulo_util/style.cljs
@@ -1,5 +1,5 @@
 
-(ns app.style (:require [hsl.core :refer [hsl]] [respo-ui.core :as ui]))
+(ns cumulo-util.style (:require [hsl.core :refer [hsl]] [respo-ui.core :as ui]))
 
 (def link
   {:text-decoration :underline,

diff --git a/src/app/twig/container.cljs → src/cumulo_util/twig/container.cljs b/src/app/twig/container.cljs → src/cumulo_util/twig/container.cljs
@@ -1,7 +1,7 @@
 
-(ns app.twig.container
+(ns cumulo-util.twig.container
   (:require [recollect.twig :refer [deftwig]]
-            [app.twig.user :refer [twig-user]]
+            [cumulo-util.twig.user :refer [twig-user]]
             ["randomcolor" :as color]))
 
 (deftwig

diff --git a/src/cumulo_util/twig/user.cljs b/src/cumulo_util/twig/user.cljs
@@ -0,0 +1,4 @@
+
+(ns cumulo-util.twig.user (:require [recollect.twig :refer [deftwig]]))
+
+(deftwig twig-user (user) (dissoc user :password))
diff --git a/src/app/updater.cljs → src/cumulo_util/updater.cljs b/src/app/updater.cljs → src/cumulo_util/updater.cljs
@@ -1,9 +1,9 @@
 
-(ns app.updater
-  (:require [app.updater.session :as session]
-            [app.updater.user :as user]
-            [app.updater.router :as router]
-            [app.schema :as schema]
+(ns cumulo-util.updater
+  (:require [cumulo-util.updater.session :as session]
+            [cumulo-util.updater.user :as user]
+            [cumulo-util.updater.router :as router]
+            [cumulo-util.schema :as schema]
             [respo-message.updater :refer [update-messages]]))
 
 (defn updater [db op op-data sid op-id op-time]

diff --git a/src/app/updater/router.cljs → src/cumulo_util/updater/router.cljs b/src/app/updater/router.cljs → src/cumulo_util/updater/router.cljs
@@ -1,4 +1,4 @@
 
-(ns app.updater.router )
+(ns cumulo-util.updater.router )
 
 (defn change [db op-data sid op-id op-time] (assoc-in db [:sessions sid :router] op-data))
diff --git a/src/app/updater/session.cljs → src/cumulo_util/updater/session.cljs b/src/app/updater/session.cljs → src/cumulo_util/updater/session.cljs
@@ -1,5 +1,5 @@
 
-(ns app.updater.session (:require [app.schema :as schema]))
+(ns cumulo-util.updater.session (:require [cumulo-util.schema :as schema]))
 
 (defn connect [db op-data sid op-id op-time]
   (assoc-in db [:sessions sid] (merge schema/session {:id sid})))

diff --git a/src/app/updater/user.cljs → src/cumulo_util/updater/user.cljs b/src/app/updater/user.cljs → src/cumulo_util/updater/user.cljs
@@ -1,5 +1,6 @@
 
-(ns app.updater.user (:require [app.util :refer [find-first]] ["md5" :as md5]))
+(ns cumulo-util.updater.user
+  (:require [cumulo-util.core :refer [find-first]] ["md5" :as md5]))
 
 (defn log-in [db op-data sid op-id op-time]
   (let [[username password] op-data

diff --git a/yarn.lock b/yarn.lock
@@ -842,10 +842,10 @@ ws@^3.0.0:
     safe-buffer "~5.1.0"
     ultron "~1.1.0"
 
-ws@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.0.tgz#119a9dbf92c54e190ec18d10e871d55c95cf9373"
-  integrity sha512-H3dGVdGvW2H8bnYpIDc3u3LH8Wue3Qh+Zto6aXXFzvESkTVT6rAfKR6tR/+coaUvxs8yHtmNV0uioBF62ZGSTg==
+ws@^6.1.2:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.2.tgz#3cc7462e98792f0ac679424148903ded3b9c3ad8"
+  integrity sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw==
   dependencies:
     async-limiter "~1.0.0"