From 11cb648399908b19a48ece5e9e290c6ebd496aea Mon Sep 17 00:00:00 2001
From: Elliot Glaysher <elliot@tlon.io>
Date: Thu, 9 Aug 2018 14:59:33 -0700
Subject: [PATCH] Trying to get collections working

---
 lib/hood/drum.hoon                        | 15 +++++------
 lib/old-zuse.hoon                         | 11 --------
 sys/vane/ford.hoon                        | 33 +++++++++++++++++++----
 web/collections/{readme.md => readme.umd} |  0
 4 files changed, 35 insertions(+), 24 deletions(-)
 rename web/collections/{readme.md => readme.umd} (100%)

diff --git a/lib/hood/drum.hoon b/lib/hood/drum.hoon
index bfc7c57d4..ce04187e1 100644
--- a/lib/hood/drum.hoon
+++ b/lib/hood/drum.hoon
@@ -82,14 +82,13 @@
   ::
   ::  ?:  ?=($pawn myr)
   ::    [[%base %collections] [%base %hall] [%base %talk] [%base %dojo] ~]
-  ::  :~  [%home %collections]
-  ::      [%home %acme]
-  ::      [%home %dns]
-  ::      [%home %dojo]
-  ::      [%home %hall]
-  ::      [%home %talk]
-  ::  ==
-  [[%home %dojo] ~]
+  :~  ::  [%home %collections]
+      [%home %acme]
+      [%home %dns]
+      [%home %dojo]
+      ::  [%home %hall]
+      ::  [%home %talk]
+  ==
 ::
 ++  deft-fish                                           ::  default connects
   |=  our/ship
diff --git a/lib/old-zuse.hoon b/lib/old-zuse.hoon
index 748494524..b8adc385e 100644
--- a/lib/old-zuse.hoon
+++ b/lib/old-zuse.hoon
@@ -253,17 +253,6 @@
 ++  gram        gram:eyre                               ::  inter-ship message
 ++  kiss-eyre   task:able:eyre                          ::  in request ->$
 ++  gift-eyre   gift:able:eyre                          ::  out result <-$
-++  hood        hood:ford                               ::  assembly plan
-++  hoof        hoof:ford                               ::  resource reference
-++  hoop        hoop:ford                               ::  source in hood
-++  hops        hops:ford                               ::  XX late-bound path
-++  horn        horn:ford                               ::  resource tree
-++  milk        milk:ford                               ::  sourced silk
-++  silk        silk:ford                               ::  construction layer
-++  bilk        bilk:ford                               ::  sourced request
-++  gage        gage:ford                               ::  recursive cage+tang
-++  kiss-ford   task:able:ford                          ::  in request ->$
-++  gift-ford   gift:able:ford                          ::  out result <-$
 ++  club        club:gall                               ::  agent action
 ++  cuft        cuft:gall                               ::  internal gift
 ++  culm        culm:gall                               ::  config action
diff --git a/sys/vane/ford.hoon b/sys/vane/ford.hoon
index 480dcd267..61d82d6a5 100644
--- a/sys/vane/ford.hoon
+++ b/sys/vane/ford.hoon
@@ -1706,7 +1706,7 @@
     ::  accessed-builds: builds accessed/depended on during this run.
     ::
     =|  accessed-builds=(list ^build)
-    ~&  [%turbo-make (build-to-tape build)]
+    ::  ~&  [%turbo-make (build-to-tape build)]
     ::  dispatch based on the kind of +schematic in :build
     ::
     ::
@@ -1895,9 +1895,19 @@
           [build [%blocks [toplevel-build]~ ~] accessed-builds]
         ::
         ?.  ?=([~ %success %scry *] toplevel-result)
-          ::  TODO: include :errors in the output since both failed.
+          ?~  errors
+            ~&  %no-renderer-errors1
+            (wrap-error toplevel-result)
           ::
-          (wrap-error toplevel-result)
+          ?>  ?=([~ %error *] toplevel-result)
+          =/  braces  [[' ' ' ' ~] ['{' ~] ['}' ~]]
+          %-  return-error  :~
+            [%leaf "ford: %bake {<renderer>} failed:"]
+            [%leaf "as-renderer"]
+            [%rose braces errors]
+            [%leaf "as-mark"]
+            [%rose braces message.u.toplevel-result]
+          ==
         ::
         =/  toplevel-arch=arch  ;;(arch q.q.cage.u.toplevel-result)
         ::  find the :sub-path-segments that could be files
@@ -1958,7 +1968,19 @@
           [build [%blocks [alts-build]~ ~] accessed-builds]
         ::
         ?.  ?=([~ %success %alts *] alts-result)
-          (wrap-error alts-result)
+          ?~  errors
+            ~&  %no-renderer-errors2
+            (wrap-error alts-result)
+          ::
+          ?>  ?=([~ %error *] alts-result)
+          =/  braces  [[' ' ' ' ~] ['{' ~] ['}' ~]]
+          %-  return-error  :~
+            [%leaf "ford: %bake {<renderer>} failed:"]
+            [%leaf "as-renderer"]
+            [%rose braces errors]
+            [%leaf "as-mark"]
+            [%rose braces message.u.alts-result]
+          ==
         ::
         =/  =build-result
           [%success %bake (result-to-cage u.alts-result)]
@@ -3678,6 +3700,7 @@
         ++  run-fszy
           |=  =mark
           ^-  compose-cranes
+          ::  why does this not actually run the renderer in the collections.hoon case?
           ::
           =/  bake-build=^build
             :-  date.build
@@ -3686,7 +3709,7 @@
           ?~  bake-result
             [[%block [bake-build]~] ..run-crane]
           ?:  ?=([~ %error *] bake-result)
-            [[%error [leaf+"/mark/ failed: " message.u.bake-result]] ..run-crane]
+            [[%error [leaf+"/{<mark>}/ failed: " message.u.bake-result]] ..run-crane]
           ?>  ?=([~ %success %bake *] bake-result)
           ::
           [[%subject cage.u.bake-result] ..run-crane]
diff --git a/web/collections/readme.md b/web/collections/readme.umd
similarity index 100%
rename from web/collections/readme.md
rename to web/collections/readme.umd