From 53eef4cd8ddbd3c19a2f9db77995da76c03e8b73 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Mon, 13 Feb 2017 16:02:25 -0800 Subject: [PATCH] marks mostly functional --- lib/gh-parse.hoon | 3 +++ lib/httr-to-json.hoon | 3 +++ lib/old-zuse.hoon | 2 +- mar/dill/belt.hoon | 2 ++ mar/dill/blit.hoon | 2 ++ mar/gh/issue-comment.hoon | 3 ++- mar/gh/issue.hoon | 3 ++- mar/gh/issues.hoon | 3 ++- mar/gh/list-issues.hoon | 3 ++- mar/gh/poke.hoon | 2 ++ mar/gmail/req.hoon | 2 ++ mar/lens/command.hoon | 2 ++ mar/sole/action.hoon | 2 ++ mar/sole/effect.hoon | 5 ++++- mar/talk/command.hoon | 4 +++- mar/talk/comment.hoon | 2 ++ mar/talk/fora-post.hoon | 2 ++ mar/talk/report.hoon | 6 ++++-- mar/talk/telegrams.hoon | 5 +++-- mar/tree/hymn.hoon | 2 ++ mar/tree/json.hoon | 2 +- mar/twit/cred.hoon | 3 ++- mar/twit/feed.hoon | 3 ++- mar/twit/post.hoon | 3 ++- mar/twit/req.hoon | 3 ++- mar/twit/usel.hoon | 3 ++- mar/womb/balance.hoon | 3 ++- mar/womb/bonus.hoon | 2 ++ mar/womb/claim.hoon | 2 ++ mar/womb/invite.hoon | 3 ++- mar/womb/recycle.hoon | 2 ++ mar/womb/stat-all.hoon | 3 ++- mar/womb/ticket-info.hoon | 2 ++ mar/write/paste.hoon | 2 ++ mar/write/plan-info.hoon | 2 ++ mar/write/tree.hoon | 2 ++ mar/write/wipe.hoon | 2 ++ sur/gmail-label.hoon | 15 ++++++++------- sys/vane/ford.hoon | 1 + 39 files changed, 89 insertions(+), 27 deletions(-) diff --git a/lib/gh-parse.hoon b/lib/gh-parse.hoon index bc063155f4..025dcdbb76 100644 --- a/lib/gh-parse.hoon +++ b/lib/gh-parse.hoon @@ -4,6 +4,8 @@ :: marks should include this library. :: /- gh +/+ old-zuse +=, old-zuse |% ++ repository ^- $-(json (unit repository:gh)) @@ -150,6 +152,7 @@ ++ id no:jo ++ print-issue |= issue:gh + =, format ^- wain =+ c=(cury cat 3) :* :(c 'title: ' title ' (#' (rsh 3 2 (scot %ui number)) ')') diff --git a/lib/httr-to-json.hoon b/lib/httr-to-json.hoon index c908da982c..d3d8ab05a7 100644 --- a/lib/httr-to-json.hoon +++ b/lib/httr-to-json.hoon @@ -1 +1,4 @@ +/+ old-zuse +=, old-zuse +=, format |=(hit/httr ~|(hit ?>(?=($2 (div p.hit 100)) (need (de-json q:(need r.hit)))))) diff --git a/lib/old-zuse.hoon b/lib/old-zuse.hoon index 16295c4841..9f28139183 100644 --- a/lib/old-zuse.hoon +++ b/lib/old-zuse.hoon @@ -164,7 +164,7 @@ ++ mess mess:eyre :: raw http headers ++ meta !! :: path metadata ++ meth meth:eyre :: http methods -++ mime !! :: mimetyped data +++ mime mime.is :: mimetyped data ++ mite mite:eyre :: mime type ++ miso miso:clay :: ankh delta ++ misu misu:clay :: computed delta diff --git a/mar/dill/belt.hoon b/mar/dill/belt.hoon index 03f0b16d00..7409dc1d2b 100644 --- a/mar/dill/belt.hoon +++ b/mar/dill/belt.hoon @@ -3,10 +3,12 @@ :: /? 310 /- kyev, sole +/+ old-zuse :: :::: :: =, sole +=, old-zuse |_ dill-belt :: ++ grab :: convert from diff --git a/mar/dill/blit.hoon b/mar/dill/blit.hoon index 777c0b5edf..6ef59485ad 100644 --- a/mar/dill/blit.hoon +++ b/mar/dill/blit.hoon @@ -3,7 +3,9 @@ :: /? 310 /- sole +/+ old-zuse =, sole +=, old-zuse |_ dib/dill-blit :: ++ grab :: convert from diff --git a/mar/gh/issue-comment.hoon b/mar/gh/issue-comment.hoon index 2b2f71acc5..a9eb81ee01 100644 --- a/mar/gh/issue-comment.hoon +++ b/mar/gh/issue-comment.hoon @@ -1,6 +1,7 @@ :: Converts the result of an 'issues' event into a issues:gh. /- gh -/+ gh-parse, talk +/+ gh-parse, talk, old-zuse +=, old-zuse |_ issue-comment/issue-comment:gh ++ grow |% diff --git a/mar/gh/issue.hoon b/mar/gh/issue.hoon index 073bca80af..84df6402a1 100644 --- a/mar/gh/issue.hoon +++ b/mar/gh/issue.hoon @@ -1,6 +1,7 @@ /- gh -/+ gh-parse +/+ gh-parse, old-zuse =, mimes:html +=, old-zuse |_ issue/issue:gh ++ grab |% diff --git a/mar/gh/issues.hoon b/mar/gh/issues.hoon index b3d441939c..53d484d5db 100644 --- a/mar/gh/issues.hoon +++ b/mar/gh/issues.hoon @@ -1,6 +1,7 @@ :: Converts the result of an 'issues' event into a issues:gh. /- gh -/+ gh-parse, talk +/+ gh-parse, talk, old-zuse +=, old-zuse |_ issues/issues:gh ++ grow |% diff --git a/mar/gh/list-issues.hoon b/mar/gh/list-issues.hoon index 80a0170e83..5ed85558f0 100644 --- a/mar/gh/list-issues.hoon +++ b/mar/gh/list-issues.hoon @@ -1,6 +1,7 @@ /- gh -/+ gh-parse +/+ gh-parse, old-zuse =, mimes:html +=, old-zuse |_ issues/(list issue:gh) ++ grab |% diff --git a/mar/gh/poke.hoon b/mar/gh/poke.hoon index 32f4046787..fa987dd1a0 100644 --- a/mar/gh/poke.hoon +++ b/mar/gh/poke.hoon @@ -1,3 +1,5 @@ +/+ old-zuse +=, old-zuse |_ {method/meth endpoint/(list @t) jon/json} ++ grab |% diff --git a/mar/gmail/req.hoon b/mar/gmail/req.hoon index d8d872ff13..b85888887f 100644 --- a/mar/gmail/req.hoon +++ b/mar/gmail/req.hoon @@ -1,5 +1,7 @@ /- rfc, gmail-label +/+ old-zuse +=, old-zuse |_ {method/meth endpoint/path query/quay mes/?(message:rfc label-req:gmail-label)} :: jon=(unit json)] ++ grab |% diff --git a/mar/lens/command.hoon b/mar/lens/command.hoon index c839f165a2..5952b075d1 100644 --- a/mar/lens/command.hoon +++ b/mar/lens/command.hoon @@ -1,5 +1,7 @@ /- lens +/+ old-zuse :: +=, old-zuse |_ com/command:lens ++ grab |% diff --git a/mar/sole/action.hoon b/mar/sole/action.hoon index 558eff4e23..e117e80cc4 100644 --- a/mar/sole/action.hoon +++ b/mar/sole/action.hoon @@ -3,10 +3,12 @@ :: /? 310 /- sole +/+ old-zuse :: :::: :: =, sole +=, old-zuse |_ sole-action :: ++ grab :: convert from diff --git a/mar/sole/effect.hoon b/mar/sole/effect.hoon index 42a2fcac21..4e5ce64980 100644 --- a/mar/sole/effect.hoon +++ b/mar/sole/effect.hoon @@ -3,13 +3,16 @@ :: /? 310 /- sole +/+ old-zuse :: :::: :: =, sole =, format +=, old-zuse |% ++ mar-sole-change :: XX dependency + =, old-zuse |_ cha/sole-change ++ grow |% ++ json @@ -51,7 +54,7 @@ ++ lens-json :: json for cli client ^- ?($~ ^json) :: null = ignore ?+ -.sef ~ - $tan (wall (turn (flop p.sef) ~(ram re a)))) + $tan (wall (turn (flop p.sef) |=(a/tank ~(ram re a)))) $txt s+(crip p.sef) $sav (pairs file+s+(crip <`path`p.sef>) data+s+(crip (sifo q.sef)) ~) diff --git a/mar/talk/command.hoon b/mar/talk/command.hoon index 44b6950477..700fe3b960 100644 --- a/mar/talk/command.hoon +++ b/mar/talk/command.hoon @@ -3,6 +3,7 @@ :: /? 310 /- talk +/+ old-zuse :: =, talk |_ cod/command @@ -11,7 +12,8 @@ |% ++ noun command :: clam from %noun ++ json - => [jo ..command] + =, old-zuse + =, jo |= a/json ^- command =- (need ((of -) a)) =< :~ publish+(ar thot) diff --git a/mar/talk/comment.hoon b/mar/talk/comment.hoon index 4c74b58860..e00b0c831b 100644 --- a/mar/talk/comment.hoon +++ b/mar/talk/comment.hoon @@ -2,7 +2,9 @@ :::: /hoon/comment/talk/mar :: /? 310 +/+ old-zuse :: +=, old-zuse |_ {pax/path sup/spur txt/@t} ++ grab |% diff --git a/mar/talk/fora-post.hoon b/mar/talk/fora-post.hoon index 8ac6f36b78..837487115b 100644 --- a/mar/talk/fora-post.hoon +++ b/mar/talk/fora-post.hoon @@ -2,7 +2,9 @@ :::: /hoon/fora-post/talk/mar :: /? 310 +/+ old-zuse :: +=, old-zuse |_ {pax/path sup/spur hed/@t txt/@t} ++ grab |% diff --git a/mar/talk/report.hoon b/mar/talk/report.hoon index 2fe264f15d..541ad1075d 100644 --- a/mar/talk/report.hoon +++ b/mar/talk/report.hoon @@ -3,11 +3,13 @@ :: /? 310 /- talk -/+ talk +/+ talk, old-zuse :: =, talk =, mimes:html =, html +=, format +=, old-zuse |_ rep/report :: ++ grab :: convert from @@ -39,7 +41,7 @@ delivery+[%s b] == ++ jope |=(a/ship (jape +:)) ::[%s (crip +:(scow %p a))]) - ++ joke |=(a/tank (jape (of-wall (wash 0^80 a))) + ++ joke |=(a/tank (jape (of-wall (wash 0^80 a)))) ++ jode |=(a/time (jone (div (mul (sub a ~1970.1.1) 1.000) ~s1))) ++ jome :: stringify keys |* {a/_cord b/_json} diff --git a/mar/talk/telegrams.hoon b/mar/talk/telegrams.hoon index 6c44c0c6df..a5e1e4dc64 100644 --- a/mar/talk/telegrams.hoon +++ b/mar/talk/telegrams.hoon @@ -3,12 +3,13 @@ :: /? 310 /- talk -/+ talk,map-to-json +/+ talk,map-to-json, old-zuse :: =, talk =, mimes:html =, format =, html +=, old-zuse |_ gam/(list telegram) :: ++ grab @@ -128,7 +129,7 @@ == :: ++ jope |=(a/ship (jape +:)) ::[%s (crip +:(scow %p a))]) - ++ joke |=(a/tank (jape (of-wall (wash 0^80 a)))]) + ++ joke |=(a/tank (jape (of-wall (wash 0^80 a)))) ++ jode |=(a/time (jone (div (mul (sub a ~1970.1.1) 1.000) ~s1))) :: ++ thot diff --git a/mar/tree/hymn.hoon b/mar/tree/hymn.hoon index 44f5f52cdb..51c9a85d8c 100644 --- a/mar/tree/hymn.hoon +++ b/mar/tree/hymn.hoon @@ -2,7 +2,9 @@ :::: /hoon/hymn/tree/mar :: /? 310 +/+ old-zuse =, mimes:html +=, old-zuse |_ own/manx :: ++ grow :: convert to diff --git a/mar/tree/json.hoon b/mar/tree/json.hoon index 0b893d9595..c3e2ebf537 100644 --- a/mar/tree/json.hoon +++ b/mar/tree/json.hoon @@ -11,7 +11,7 @@ :: ++ grow :: convert to |% - ++ mime [/text/json (as-octs (en-json jon))] :: convert to %mime + ++ mime [/text/json (as-octt (en-json jon))] :: convert to %mime -- ++ grab |% :: convert from diff --git a/mar/twit/cred.hoon b/mar/twit/cred.hoon index 4b5ceb04cf..5f5cb3421a 100644 --- a/mar/twit/cred.hoon +++ b/mar/twit/cred.hoon @@ -3,7 +3,8 @@ :::: /hoon/cred/twit/mar :: /- plan-acct -/+ httr-to-json, twitter +/+ httr-to-json, twitter, old-zuse +=, old-zuse |_ {acc/plan-acct raw/json} ++ grab |% diff --git a/mar/twit/feed.hoon b/mar/twit/feed.hoon index b5c8f39f42..a3e2f99449 100644 --- a/mar/twit/feed.hoon +++ b/mar/twit/feed.hoon @@ -3,7 +3,8 @@ :::: /hoon/feed/twit/mar :: /- talk -/+ twitter, httr-to-json +/+ twitter, httr-to-json, old-zuse +=, old-zuse |_ fed/(list post:twitter) ++ grab |% diff --git a/mar/twit/post.hoon b/mar/twit/post.hoon index 003eac6836..6b74adbd8b 100644 --- a/mar/twit/post.hoon +++ b/mar/twit/post.hoon @@ -2,7 +2,8 @@ :: :::: /hoon/post/twit/mar :: -/+ twitter, httr-to-json +/+ twitter, httr-to-json, old-zuse +=, old-zuse |_ post:twitter ++ grab |% diff --git a/mar/twit/req.hoon b/mar/twit/req.hoon index 3fce3ff49a..cc37ba4a36 100644 --- a/mar/twit/req.hoon +++ b/mar/twit/req.hoon @@ -2,7 +2,8 @@ :: :::: /hoon/req/twit/mar :: -/+ twitter +/+ twitter, old-zuse +=, old-zuse |_ {req/endpoint:reqs:twitter quy/quay} ++ grab |% diff --git a/mar/twit/usel.hoon b/mar/twit/usel.hoon index 317e5ef538..07687fd886 100644 --- a/mar/twit/usel.hoon +++ b/mar/twit/usel.hoon @@ -2,7 +2,8 @@ :: :::: /hoon/usel/twit/mar :: -/+ twitter, httr-to-json +/+ twitter, httr-to-json, old-zuse +=, old-zuse |_ (list who/@ta) ++ grab |% diff --git a/mar/womb/balance.hoon b/mar/womb/balance.hoon index e22a35c2a2..767ad7eeff 100644 --- a/mar/womb/balance.hoon +++ b/mar/womb/balance.hoon @@ -2,10 +2,11 @@ :::: /hoon/stat-all/womb/mar :: /? 310 -/+ womb +/+ womb, old-zuse :: :::: ~fyr :: +=, old-zuse |_ balance:womb :: ++ grab :: convert from diff --git a/mar/womb/bonus.hoon b/mar/womb/bonus.hoon index da5a8ce71d..7600d74bf8 100644 --- a/mar/womb/bonus.hoon +++ b/mar/womb/bonus.hoon @@ -2,6 +2,8 @@ :::: /hoon/bonus/womb/mar :: /? 310 +/+ old-zuse +=, old-zuse |_ {aut/@uvH pla/@u sta/@u} :: ++ grab :: convert from diff --git a/mar/womb/claim.hoon b/mar/womb/claim.hoon index dc271c349a..aba2dd4b75 100644 --- a/mar/womb/claim.hoon +++ b/mar/womb/claim.hoon @@ -2,6 +2,8 @@ :::: /hoon/claim/womb/mar :: /? 310 +/+ old-zuse +=, old-zuse |_ {aut/@uvH her/@p} :: ++ grab :: convert from diff --git a/mar/womb/invite.hoon b/mar/womb/invite.hoon index b546e32713..c7b05f48b6 100644 --- a/mar/womb/invite.hoon +++ b/mar/womb/invite.hoon @@ -2,10 +2,11 @@ :::: /hoon/stat-all/womb/mar :: /? 310 -/+ womb +/+ womb, old-zuse :: :::: ~fyr :: +=, old-zuse |_ {cord invite}:womb :: ++ grab :: convert from diff --git a/mar/womb/recycle.hoon b/mar/womb/recycle.hoon index a4dd1c51b3..df8f0b7553 100644 --- a/mar/womb/recycle.hoon +++ b/mar/womb/recycle.hoon @@ -2,6 +2,8 @@ :::: /hoon/recycle/womb/mar :: /? 310 +/+ old-zuse +=, old-zuse |_ {who/@txmail him/knot tik/knot} :: ++ grab :: convert from diff --git a/mar/womb/stat-all.hoon b/mar/womb/stat-all.hoon index 4f6970c538..c4e0ac9472 100644 --- a/mar/womb/stat-all.hoon +++ b/mar/womb/stat-all.hoon @@ -2,10 +2,11 @@ :::: /hoon/stat-all/womb/mar :: /? 310 -/+ womb +/+ womb, old-zuse :: :::: ~fyr :: +=, old-zuse |_ all/(map ship stat:womb) :: ++ grab :: convert from diff --git a/mar/womb/ticket-info.hoon b/mar/womb/ticket-info.hoon index 5acf092b93..b871bbce7e 100644 --- a/mar/womb/ticket-info.hoon +++ b/mar/womb/ticket-info.hoon @@ -2,9 +2,11 @@ :::: /hoon/stat-all/womb/mar :: /? 310 +/+ old-zuse :: :::: ~fyr :: +=, old-zuse |_ {pas/@uvH status/?($fail $good $used)} :: ++ grab diff --git a/mar/write/paste.hoon b/mar/write/paste.hoon index 53b57ee2b0..65cecaf14b 100644 --- a/mar/write/paste.hoon +++ b/mar/write/paste.hoon @@ -2,7 +2,9 @@ :::: /hoon/paste/write/mar :: /? 310 +/+ old-zuse :: +=, old-zuse |_ {typ/?($hoon $md $txt) txt/@t} ++ grab |% diff --git a/mar/write/plan-info.hoon b/mar/write/plan-info.hoon index 47bdb41016..c0c0615606 100644 --- a/mar/write/plan-info.hoon +++ b/mar/write/plan-info.hoon @@ -2,7 +2,9 @@ :::: /hoon/paste/write/mar :: /? 310 +/+ old-zuse :: +=, old-zuse |_ {who/@txname loc/@txloc} ++ grab |% diff --git a/mar/write/tree.hoon b/mar/write/tree.hoon index 6a4ea14e25..bdf819fe37 100644 --- a/mar/write/tree.hoon +++ b/mar/write/tree.hoon @@ -2,8 +2,10 @@ :::: /hoon/tree/write/mar :: /? 310 +/+ old-zuse :: =, mimes:html +=, old-zuse |_ {sup/spur mim/mime} ++ grab |% diff --git a/mar/write/wipe.hoon b/mar/write/wipe.hoon index 67639cd310..343f7a7380 100644 --- a/mar/write/wipe.hoon +++ b/mar/write/wipe.hoon @@ -2,7 +2,9 @@ :::: /hoon/wipe/write/mar :: /? 310 +/+ old-zuse :: +=, old-zuse |_ spur ++ grab |% diff --git a/sur/gmail-label.hoon b/sur/gmail-label.hoon index 9e6a9a30c7..8efc99f6de 100644 --- a/sur/gmail-label.hoon +++ b/sur/gmail-label.hoon @@ -22,13 +22,14 @@ :: the label resource returned by gmail in response to your successful request ++ label * -++ label-req-to-json - |= label-req - %- jobe :^ - ['name' `json`s+name] - ['labelListVisibility' `json`s+(crip (sifo `cord`llv))] - ['messageListVisibility' `json`s+(crip (sifo `cord`mlv))] - ~ +++ label-req-to-json !! +:: XX belongs in a lib/ +:: |= label-req +:: %- jobe :^ +:: ['name' `json`s+name] +:: ['labelListVisibility' `json`s+(crip (sifo `cord`llv))] +:: ['messageListVisibility' `json`s+(crip (sifo `cord`mlv))] +:: ~ -- diff --git a/sys/vane/ford.hoon b/sys/vane/ford.hoon index 2b8eee007e..86e438ae2a 100644 --- a/sys/vane/ford.hoon +++ b/sys/vane/ford.hoon @@ -1696,6 +1696,7 @@ ?~ bir (fine cof ..neck) =. boy ?: p.i.bir boy +:: ~& ford+tscm+[q.i.bir boy] (welp boy [[%use [%limb q.i.bir] [%$ 1]] ~]) =+ byf=(~(get by bil) q.i.bir) ?^ byf