mosaic-headless 1.29.2 → 1.30.0

package/tools/theme_zip.py

@@ -32,6 +32,7 @@ under the same milestone, one chunk per request, `totalChunks` on each.
 """
 from __future__ import annotations
 
+import mosaic_config
 import argparse
 import email.parser
 import email.policy
@@ -202,19 +203,21 @@ def main():
     ap = argparse.ArgumentParser()
     sub = ap.add_subparsers(dest="cmd", required=True)
     e = sub.add_parser("export")
-    e.add_argument("--config", required=True)
+    e.add_argument("--config",
+                    help="JSON with base/cookie/nonce; omit it and the MOSAIC_SITE_URL / MOSAIC_REST_COOKIE / MOSAIC_REST_NONCE environment variables supply them instead")
     e.add_argument("--theme", help="themeID; default is the config's")
     e.add_argument("--out", required=True)
     e.add_argument("--simple", action="store_true", help="Mosaic's simpleExport flag")
     i = sub.add_parser("import")
-    i.add_argument("--config", required=True)
+    i.add_argument("--config",
+                    help="JSON with base/cookie/nonce; omit it and the MOSAIC_SITE_URL / MOSAIC_REST_COOKIE / MOSAIC_REST_NONCE environment variables supply them instead")
     i.add_argument("--zip", required=True)
     i.add_argument("--activate", action="store_true",
                    help="make the imported theme the live site (default: test mode)")
     i.add_argument("--replace", metavar="THEMEID",
                    help="DELETE this theme and import over it")
     a = ap.parse_args()
-    cfg = json.load(open(a.config, encoding="utf-8"))
+    cfg = mosaic_config.load(a.config)
     (export_theme if a.cmd == "export" else import_theme)(a, cfg)
 
 

package/tools/verify_browser.py

@@ -47,6 +47,7 @@ rated `error`.
 """
 from __future__ import annotations
 
+import mosaic_config
 import argparse
 import csv
 import json
@@ -605,7 +606,8 @@ def resolve_tokens(value, spec):
 
 def main():
     ap = argparse.ArgumentParser()
-    ap.add_argument("--config", required=True)
+    ap.add_argument("--config",
+                    help="JSON with base/cookie/nonce; omit it and the MOSAIC_SITE_URL / MOSAIC_REST_COOKIE / MOSAIC_REST_NONCE environment variables supply them instead")
     ap.add_argument("--site", required=True)
     ap.add_argument("--csv", help="the computed-value table")
     ap.add_argument("--audit", help="the design-audit findings")
@@ -617,7 +619,7 @@ def main():
     ap.add_argument("--page", help="only this slug")
     a = ap.parse_args()
 
-    cfg = json.load(open(a.config, encoding="utf-8"))
+    cfg = mosaic_config.load(a.config)
     spec = json.load(open(a.site, encoding="utf-8"))
 
     rows, findings, hard = [], [], 0

package/tools/verify_intro.py

@@ -43,6 +43,7 @@ cannot run, the overlay does not exist. The failure direction is "no intro", nev
 """
 from __future__ import annotations
 
+import mosaic_config
 import argparse
 import csv
 import json
@@ -249,7 +250,8 @@ def changed(readings, ids):
 
 def main():
     ap = argparse.ArgumentParser()
-    ap.add_argument("--config", required=True)
+    ap.add_argument("--config",
+                    help="JSON with base/cookie/nonce; omit it and the MOSAIC_SITE_URL / MOSAIC_REST_COOKIE / MOSAIC_REST_NONCE environment variables supply them instead")
     ap.add_argument("--site", required=True)
     ap.add_argument("--page")
     ap.add_argument("--veil-prefix", default="mk-boot",
@@ -262,7 +264,7 @@ def main():
     ap.add_argument("--frames")
     a = ap.parse_args()
 
-    cfg = json.load(open(a.config, encoding="utf-8"))
+    cfg = mosaic_config.load(a.config)
     spec = json.load(open(a.site, encoding="utf-8"))
     slug = a.page or spec["pages"][0]["slug"]
     url = "%s/%s/" % (cfg["base"].rstrip("/"), slug)

package/tools/verify_rwd.py

@@ -53,6 +53,7 @@ breakpoint declared. Writing narrow-screen `customDeclarations` that simply omit
 leaves the wide-screen border standing, drawing rules in the middle of nowhere on a
 collapsed layout. Every such omission is reported as RESET-RISK.
 """
+import mosaic_config
 import argparse
 import csv
 import json
@@ -292,12 +293,13 @@ def component_tree(spec, name, instance_attr):
 
 def main():
     ap = argparse.ArgumentParser()
-    ap.add_argument("--config", required=True)
+    ap.add_argument("--config",
+                    help="JSON with base/cookie/nonce; omit it and the MOSAIC_SITE_URL / MOSAIC_REST_COOKIE / MOSAIC_REST_NONCE environment variables supply them instead")
     ap.add_argument("--site", required=True)
     ap.add_argument("--csv")
     a = ap.parse_args()
 
-    cfg = json.load(open(a.config, encoding="utf-8"))
+    cfg = mosaic_config.load(a.config)
     site = json.load(open(a.site, encoding="utf-8"))
     base = cfg["base"].rstrip("/")