From d61656178703ce720f21171f8a0e2ba3555d589c Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Mon, 7 Dec 2015 11:24:35 -0800 Subject: [PATCH 1/6] Fixed dojo spur prompt --- ape/dojo.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ape/dojo.hoon b/ape/dojo.hoon index 6215e9fd3..abb76ce8d 100644 --- a/ape/dojo.hoon +++ b/ape/dojo.hoon @@ -828,7 +828,7 @@ "/" ?:(=(%home q.dir) "=" (trip q.dir)) "/" ?:(=([%ud 0] r.dir) "=" (scow r.dir)) == - ?:(=(~ s.dir) "" (spud s.dir)) + ?:(=(~ s.dir) "" (spud (flop s.dir))) :: ++ he-prom :: send prompt %- he-diff From 6c0d8ec6bfe9287435fd6bce552899ff86ccf7ea Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Mon, 7 Dec 2015 14:19:14 -0800 Subject: [PATCH 2/6] fix #634 gall |mass, kiln |mv --- arvo/gall.hoon | 14 +++----------- lib/kiln.hoon | 2 +- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/arvo/gall.hoon b/arvo/gall.hoon index f77502516..29d95e2e0 100644 --- a/arvo/gall.hoon +++ b/arvo/gall.hoon @@ -1218,17 +1218,9 @@ :^ hen %give %mass :- %gall :- %| - %- |= a=(list (list mass)) ^- (list mass) :: XX single-home - =+ a2=a - ?~ a !! - ?~ i.a ~ - :_ $(a (turn a2 tail)) - :- p.i.i.a - ?~ -.q.i.i.a - [%& (turn (turn a2 head) |=(b=mass ?~(-.q.b p.q.b !!)))] - [%| $(a (turn (turn a2 head) |=(b=mass ?~(-.q.b !! p.q.b))))] - %+ turn (~(tap by pol.all)) - |= [@ mast] + %+ turn (~(tap by pol.all)) :: XX single-home + |= [our=@ mast] ^- mass + :+ (scot %p our) %| :~ foreign/`sap blocked/[%| (sort :_(aor (~(tap by (~(run by wub) |=(sofa `+<))))))] active/[%| (sort :_(aor (~(tap by (~(run by bum) |=(seat `+<))))))] diff --git a/lib/kiln.hoon b/lib/kiln.hoon index 3eaa2b091..0f9358153 100644 --- a/lib/kiln.hoon +++ b/lib/kiln.hoon @@ -142,7 +142,7 @@ |= [input=path output=path] %+ do-info "moved" ?> =(-:(flop input) -:(flop output)) - %+ furl (fray output) + %+ furl (fray input) (foal output -:(flop input) %noun .^(%cx input)) :: ++ poke-label From 7319bd903ff17de200328908e6251ecb4c04b793 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Mon, 7 Dec 2015 15:07:27 -0800 Subject: [PATCH 3/6] ? and ?? print mark unless it's %noun --- ape/dojo.hoon | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ape/dojo.hoon b/ape/dojo.hoon index 6215e9fd3..73b38812d 100644 --- a/ape/dojo.hoon +++ b/ape/dojo.hoon @@ -483,10 +483,11 @@ :: %show %+ dy-print cay + =+ mar=|.(?:(=(%noun p.cay) ~ [%rose [~ " " ~] >p.cay< ~]~)) ?- p.p.mad 0 ~ - 1 [%rose [~ " " ~] (skol p.q.cay) ~]~ :: [%rose [~ " " ~] >p.cay< ~] - 2 [%rose [~ " " ~] (dy-show-type-noun p.q.cay) ~]~ + 1 [[%rose [~ " " ~] (skol p.q.cay) ~] (mar)] + 2 [[%rose [~ " " ~] (dy-show-type-noun p.q.cay) ~] (mar)] == == :: From a7f20a3323f85b7b902233f977fd6e2eebdfebf5 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Mon, 7 Dec 2015 17:46:18 -0800 Subject: [PATCH 4/6] moved :write into hood --- ape/hood.hoon | 9 ++++++- ape/write.hoon | 36 ---------------------------- lib/write.hoon | 58 +++++++++++++++++++++++++++++++++++++++++++++ pub/paste/elem.hook | 2 +- 4 files changed, 67 insertions(+), 38 deletions(-) delete mode 100644 ape/write.hoon create mode 100644 lib/write.hoon diff --git a/ape/hood.hoon b/ape/hood.hoon index 38e41042c..3e82851f7 100644 --- a/ape/hood.hoon +++ b/ape/hood.hoon @@ -2,7 +2,7 @@ :::: /hoon/hood/ape :: :: :: :: :: /? 314 :: zuse version -/+ sole, talk, helm, kiln, drum :: libraries +/+ sole, talk, helm, kiln, drum, write :: libraries [. helm kiln drum] :: :: :: :::: :: :: @@ -17,6 +17,7 @@ %drum ?>(?=(%drum -.paw) `drum-part`paw) :: %helm ?>(?=(%helm -.paw) `helm-part`paw) :: %kiln ?>(?=(%kiln -.paw) `kiln-part`paw) :: + %write ?>(?=(%write -.paw) `part:write`paw) :: == :: ++ hood-head ,_-:*hood-part :: ++ hood-make :: @@ -25,11 +26,13 @@ %drum (drum-port our) :: %helm *helm-part :: %kiln *kiln-part :: + %write *part:write :: == :: ++ hood-part :: $% [%drum %0 drum-pith] :: [%helm %0 helm-pith] :: [%kiln %0 kiln-pith] :: + [%write %0 pith:write] :: == :: -- :: :: :: :: @@ -81,8 +84,10 @@ ++ from-drum (from-lib %drum [..$ ,_se-abet]:(drum)) ++ from-helm (from-lib %helm [..$ ,_abet]:(helm)) ++ from-kiln (from-lib %kiln [..$ ,_abet]:(kiln)) +++ from-write (from-lib %write [..$ ,_abet]:(write)) :: ++ init-helm |=([way=wire *] [~ +>]) +++ made-write (wrap made):from-write ++ made-kiln (wrap take-made):from-kiln ++ mere-kiln (wrap take-mere):from-kiln ++ mere-kiln-sync (wrap take-mere-sync):from-kiln @@ -102,6 +107,7 @@ ++ poke-helm-reload (wrap poke-reload):from-helm ++ poke-helm-reload-desk (wrap poke-reload-desk):from-helm ++ poke-helm-reset (wrap poke-reset):from-helm +++ poke-helm-serve (wrap poke-serve):from-helm ++ poke-helm-send-hi (wrap poke-send-hi):from-helm ++ poke-helm-send-ask (wrap poke-send-ask):from-helm ++ poke-helm-verb (wrap poke-verb):from-helm @@ -121,6 +127,7 @@ ++ poke-kiln-overload (wrap poke-overload):from-kiln ++ poke-kiln-unmount (wrap poke-unmount):from-kiln ++ poke-kiln-unsync (wrap poke-unsync):from-kiln +++ poke-write-paste (wrap poke-paste):from-write ++ poke-will (wrap poke-will):from-helm ++ quit-drum-phat (wrap quit-phat):from-drum ++ reap-drum-phat (wrap reap-phat):from-drum diff --git a/ape/write.hoon b/ape/write.hoon deleted file mode 100644 index 0359d6d50..000000000 --- a/ape/write.hoon +++ /dev/null @@ -1,36 +0,0 @@ -:: File writer -:: -:::: /hoon/write/app - :: -|_ [bowl ~] -++ beak-now byk(r [%da now]) -++ poke-json - |= jon=json - =- (poke--data (need (- jon.+))) - => jo - %- ot :~ - pax/(cu deft (su fel:stab)) - dat/(of json/some mime/(pe / (cu taco so)) ~) :: XX mite - == -:: -++ poke-write-paste - |= [typ=?(%hoon %md %txt) txt=@t] - (poke--data [`typ /pub/paste/(scot %da now)] %mime / (taco txt)) -:: -++ poke--data - |= [[ext=(unit ,@t) pax=path] dat=$%([%json json] [%mime mime])] - ?~ ext $(ext [~ -.dat]) - =+ cay=?-(-.dat %json [-.dat !>(+.dat)], %mime [-.dat !>(+.dat)]) - ?: =(u.ext -.dat) (made pax ~ `cay) - [[ost %exec pax our ~ beak-now %cast u.ext `cay]~ +>.$] :: XX defer %nice -:: -++ made - |= [pax=wire @ res=gage] - ?. =(our src) - ~|(foreign-write/[our=our src=src] !!) - ?+ -.res ~|(gage/-.res !!) - %| (mean p.res) - %& =- [[ost %info / our -]~ +>.$] - (foal :(welp (tope beak-now ~) pax /[-.p.res]) p.res) - == --- diff --git a/lib/write.hoon b/lib/write.hoon new file mode 100644 index 000000000..e5da87271 --- /dev/null +++ b/lib/write.hoon @@ -0,0 +1,58 @@ +:: File writer module +:: +:::: /hoon/write/lib + :: +|% +++ part ,[%write %0 pith] :: no state +++ pith ,~ +-- +:: +:::: + :: +|% +++ data $%([%json json] [%mime mime]) +++ card $% [%exec wire @p ~ [beak silk]] + [%info wire @p toro] + == +-- +:: +:::: + :: +|= [bowl part] +=* par +<+ +|_ moz=(list ,[bone card]) +++ abet [(flop moz) `part`par] +++ emit |=(a=card %_(+> moz :_(moz [ost a]))) +++ beak-now byk(r [%da now]) +:: ++ poke-json +:: |= jon=json +:: =- (poke--data (need (- jon.+))) +:: => jo +:: %- ot :~ +:: pax/(cu deft (su fel:stab)) +:: dat/(of json/some mime/(pe / (cu taco so)) ~) :: XX mite +:: == +:: +++ poke-paste + |= [typ=?(%hoon %md %txt) txt=@t] ^+ abet + (poke--data [`typ /web/paste/(scot %da now)] %mime / (taco txt)) +:: +++ poke--data + |= [[ext=(unit ,@t) pax=path] dat=data] ^+ abet + ?~ ext $(ext [~ -.dat]) + =+ cay=?-(-.dat %json [-.dat !>(+.dat)], %mime [-.dat !>(+.dat)]) + ?: =(u.ext -.dat) (made pax ~ `cay) + =< abet + %^ emit %exec write/pax :: XX defer %nice + [our ~ beak-now %cast u.ext `cay] +:: +++ made + |= [pax=wire @ res=gage] ^+ abet + ?. =(our src) + ~|(foreign-write/[our=our src=src] !!) + ?+ -.res ~|(gage/-.res !!) + %| (mean p.res) + %& =- abet:(emit %info write/~ our -) + (foal :(welp (tope beak-now ~) pax /[-.p.res]) p.res) + == +-- diff --git a/pub/paste/elem.hook b/pub/paste/elem.hook index e8f92f8ef..7d02c86d5 100644 --- a/pub/paste/elem.hook +++ b/pub/paste/elem.hook @@ -6,7 +6,7 @@ ;script@"/~/as/own/~/at/home/lib/urb.js"; ;script:''' document.title = 'pastebin - urbit' - urb.appl = 'write' + urb.appl = 'hood' urb.send.mark = 'write-paste' submit = function(){ if($("select :selected").attr('value')===undefined) { From 788948a14c30a0796e00cdd0342729d1fcb9be77 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Tue, 8 Dec 2015 11:26:46 -0800 Subject: [PATCH 5/6] mdy is /deprecated/ --- pub/docs/dev/hoon/{leap-in.mdy => leap-in.md} | 0 pub/docs/dev/hoon/leap-in/{3-app.mdy => 3-app.md} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename pub/docs/dev/hoon/{leap-in.mdy => leap-in.md} (100%) rename pub/docs/dev/hoon/leap-in/{3-app.mdy => 3-app.md} (100%) diff --git a/pub/docs/dev/hoon/leap-in.mdy b/pub/docs/dev/hoon/leap-in.md similarity index 100% rename from pub/docs/dev/hoon/leap-in.mdy rename to pub/docs/dev/hoon/leap-in.md diff --git a/pub/docs/dev/hoon/leap-in/3-app.mdy b/pub/docs/dev/hoon/leap-in/3-app.md similarity index 100% rename from pub/docs/dev/hoon/leap-in/3-app.mdy rename to pub/docs/dev/hoon/leap-in/3-app.md From a83d530cbb525578fd8e419c692003300c711127 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Tue, 8 Dec 2015 11:58:03 -0800 Subject: [PATCH 6/6] stray poke-serve in hood --- ape/hood.hoon | 1 - 1 file changed, 1 deletion(-) diff --git a/ape/hood.hoon b/ape/hood.hoon index 3e82851f7..c6d75a9e6 100644 --- a/ape/hood.hoon +++ b/ape/hood.hoon @@ -107,7 +107,6 @@ ++ poke-helm-reload (wrap poke-reload):from-helm ++ poke-helm-reload-desk (wrap poke-reload-desk):from-helm ++ poke-helm-reset (wrap poke-reset):from-helm -++ poke-helm-serve (wrap poke-serve):from-helm ++ poke-helm-send-hi (wrap poke-send-hi):from-helm ++ poke-helm-send-ask (wrap poke-send-ask):from-helm ++ poke-helm-verb (wrap poke-verb):from-helm