urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-07 05:26:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branches 'breach-20160113' and 'cleanup'

Browse Source 
Restore correct first-parentage (a few days wrong is better than a few months)
Remove an ignored empty file, lie less in talk doc
This commit is contained in:
Raymond Pasco 2016-01-17 12:49:45 -05:00
commit d54211ccfd
14 changed files with 103 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ape/bit.hoon
View File

@ -47,7 +47,7 @@ $: cred=(unit ,[app-secret=@t client-id=@t])
++ hostname ^- hart ++ hostname ^- hart
?+ (clan our.hid) !! ?+ (clan our.hid) !!
%czar [| ?+(our.hid `8.443 %~fyr `8.444) `/localhost] %czar [| ?+(our.hid `8.443 %~fyr `8.444) `/localhost]
%duke [| `8.444 `/org/urbit/(crip +:<our.hid>)] %duke [| `8.443 `/org/urbit/(crip +:<our.hid>)]
== ==
++ auth-url ++ auth-url
%+ weld "https://sandbox.coinbase.com/oauth/authorize" %+ weld "https://sandbox.coinbase.com/oauth/authorize"

6
arvo/ames.hoon
View File

@ -413,7 +413,7 @@
vix=(bex +((cut 0 [25 2] mag))) :: width of sender vix=(bex +((cut 0 [25 2] mag))) :: width of sender
tay=(cut 0 [27 5] mag) :: message type tay=(cut 0 [27 5] mag) :: message type
== ==
?> =(7 vez) ?> =(0 vez)
?> =(chk (end 0 20 (mug bod))) ?> =(chk (end 0 20 (mug bod)))
:+ [(end 3 wix bod) (cut 3 [wix vix] bod)] :+ [(end 3 wix bod) (cut 3 [wix vix] bod)]
(kins tay) (kins tay)
@ -433,7 +433,7 @@
=+ tay=(ksin q.kec) =+ tay=(ksin q.kec)
%+ mix %+ mix
%+ can 0 %+ can 0
:~ [3 7] :~ [3 0]
[20 (mug bod)] [20 (mug bod)]
[2 yax] [2 yax]
[2 qax] [2 qax]
@ -1018,7 +1018,7 @@
++ gnaw :: gnaw:am ++ gnaw :: gnaw:am
|= [kay=cape ryn=lane pac=rock] :: process packet |= [kay=cape ryn=lane pac=rock] :: process packet
^- [p=(list boon) q=fort] ^- [p=(list boon) q=fort]
?. =(7 (end 0 3 pac)) [~ fox] ?. =(0 (end 0 3 pac)) [~ fox]
=+ kec=(bite pac) =+ kec=(bite pac)
?: (goop p.p.kec) [~ fox] ?: (goop p.p.kec) [~ fox]
?. (~(has by urb.ton.fox) q.p.kec) ?. (~(has by urb.ton.fox) q.p.kec)

2
arvo/ford.hoon
View File

@ -1778,7 +1778,7 @@
?~ dif ?~ dif
=- (flaw cof leaf/"{<p.cay>} data with bad diff" -) =- (flaw cof leaf/"{<p.cay>} data with bad diff" -)
[>type=p.q.coy< >want=p:!>(*(urge cord))< ~] [>type=p.q.coy< >want=p:!>(*(urge cord))< ~]
=+ pac=(role (lurk (lore (cat 3 u.txt '\0a')) u.dif)) =+ pac=(role (lurk (lore u.txt) u.dif))
(fine cof %& p.cay [%atom %t] (end 3 (dec (met 3 pac)) pac)) (fine cof %& p.cay [%atom %t] (end 3 (dec (met 3 pac)) pac))
:: ::
%+ cope (fang cof p.cay) %+ cope (fang cof p.cay)

31
arvo/hoon.hoon
View File

@ -4788,20 +4788,31 @@
|= lub=@ |= lub=@
=| tez=(list ,@t) =| tez=(list ,@t)
|- ^+ tez |- ^+ tez
=+ ^= wor
=+ [meg=0 i=0]
|- ^- [meg=@ i=@ end=@f]
=+ gam=(cut 3 [i 1] lub)
?: =(0 gam)
[meg i %.y]
?: =(10 gam)
[meg i %.n]
$(meg (cat 3 meg gam), i +(i))
?: end.wor
(flop ^+(tez [meg.wor tez]))
?: =(0 lub) (flop tez) ?: =(0 lub) (flop tez)
=+ ^= meg $(lub (rsh 3 +(i.wor) lub), tez [meg.wor tez])
=+ meg=0
|- ^- @ud
=+ gam=(cut 3 [meg 1] lub)
?:(|(=(10 gam) =(0 gam)) meg $(meg +(meg)))
=+ res=(rsh 3 +(meg) lub)
?: &(=(0 (cut 3 [meg 1] lub)) !=(0 res))
!!
$(lub res, tez [(end 3 meg lub) tez])
:: ::
++ role :: line list to atom ++ role :: line list to atom
|= tez=(list ,@t) |= tez=(list ,@t)
(rap 3 (turn tez |=(a=@t (cat 3 a 10)))) =| [our=@ i=@ud]
|- ^- @
?~ tez
our
?: =(0 i.tez)
$(i +(i), tez t.tez, our (cat 3 our 10))
?: =(0 i)
$(i +(i), tez t.tez, our i.tez)
$(i +(i), tez t.tez, our (cat 3 (cat 3 our 10) i.tez))
:: ::
++ lump :: apply patch ++ lump :: apply patch
|= [don=udon src=*] |= [don=udon src=*]

1
gen/hood/merge.hoon
View File

@ -14,6 +14,7 @@
|= $: [now=@da eny=@uvI bek=beak] |= $: [now=@da eny=@uvI bek=beak]
[arg=[?(sorc [syd=$|(desk beaky) sorc])] cas=case gem=?(%auto germ)] [arg=[?(sorc [syd=$|(desk beaky) sorc])] cas=case gem=?(%auto germ)]
== ==
=. cas ?:(=(*case cas) da/now cas)
=* our p.bek =* our p.bek
|^ :- %kiln-merge |^ :- %kiln-merge
^- [syd=desk her=ship sud=desk cas=case gem=?(%auto germ)] ^- [syd=desk her=ship sud=desk cas=case gem=?(%auto germ)]

74
lib/kiln.hoon
View File

@ -11,6 +11,9 @@
$: rem=(map desk kiln-desk) :: $: rem=(map desk kiln-desk) ::
syn=(map kiln-sync ,[let=@ud ust=bone]) :: syn=(map kiln-sync ,[let=@ud ust=bone]) ::
autoload=? :: autoload=? ::
cur-hoon=@uvI ::
cur-zuse=@uvI ::
cur-vanes=(map ,@tas ,@uvI) ::
== :: == ::
++ kiln-desk :: per-desk state ++ kiln-desk :: per-desk state
$: auto=? :: escalate on failure $: auto=? :: escalate on failure
@ -173,14 +176,21 @@
:: ::
++ poke-start-autoload ++ poke-start-autoload
|= ~ |= ~
=. cur-hoon
((hard ,@uvI) .^(%cz /(scot %p our)/home/(scot %da now)/arvo/hoon/hoon))
=. cur-zuse
((hard ,@uvI) .^(%cz /(scot %p our)/home/(scot %da now)/arvo/zuse/hoon))
=. cur-vanes
%- mo
%+ turn `(list ,@tas)`~[%ames %behn %clay %dill %eyre %ford %gall]
|= syd=@tas
:- syd
((hard ,@uvI) .^(%cz /(scot %p our)/home/(scot %da now)/arvo/[syd]/hoon))
=< abet =< abet
%- emil %- emit
%+ turn
`(list term)`~[%ames %behn %clay %dill %eyre %ford %gall %zuse %hoon]
|= syd=term
^- card ^- card
:* %warp /kiln/autoload/[syd] [our our] %home ~ :* %warp /kiln/autoload [our our] %home ~
%next %z da/now /arvo/[syd]/hoon %next %z da/now /arvo
== ==
:: ::
++ poke-overload ++ poke-overload
@ -222,19 +232,55 @@
:: ::
++ take-writ-autoload ++ take-writ-autoload
|= [way=wire rot=riot] |= [way=wire rot=riot]
?> ?=([@ ~] way) ?> ?=(~ way)
?> ?=(^ rot) ?> ?=(^ rot)
=+ syd=(slav %tas i.way) =+ vanes=`(list ,@tas)`~[%ames %behn %clay %dill %eyre %ford %gall]
=. +>.$ =. +>.$
?. autoload ?. autoload
+>.$ +>.$
?: ?=(%hoon syd) =+ ^= new-hoon
(emit %poke /kiln/reload/[syd] [our %hood] %helm-reset ~) ((hard ,@uvI) .^(%cz /(scot %p our)/home/(scot %da now)/arvo/hoon/hoon))
(emit %poke /kiln/reload/[syd] [our %hood] %helm-reload ~[syd]) ?: !=(new-hoon cur-hoon)
=. cur-hoon new-hoon
=. cur-vanes
%- mo
%+ turn `(list ,@tas)`(turn (~(tap by cur-vanes)) head)
|= syd=@tas
:- syd
%- (hard ,@uvI)
.^(%cz /(scot %p our)/home/(scot %da now)/arvo/[syd]/hoon)
(emit %poke /kiln/reload/hoon [our %hood] %helm-reset ~)
:: XX updates cur-vanes?
=+ ^= new-zuse
((hard ,@uvI) .^(%cz /(scot %p our)/home/(scot %da now)/arvo/zuse/hoon))
?: !=(new-zuse cur-zuse)
=. cur-zuse new-zuse
=. cur-vanes
%- mo
%+ turn `(list ,@tas)`(turn (~(tap by cur-vanes)) head)
|= syd=@tas
:- syd
%- (hard ,@uvI)
.^(%cz /(scot %p our)/home/(scot %da now)/arvo/[syd]/hoon)
(emit %poke /kiln/reload/zuse [our %hood] %helm-reload [%zuse vanes])
:: XX updates cur-vanes?
=- =. ^cur-vanes cur-vanes
(emil cards)
%+ roll `(list ,@tas)`vanes
=< %_(. cur-vanes ^cur-vanes)
::^- $+([@tas _+>.^$] _+>.^$)
|= [syd=@tas cur-vanes=(map ,@tas ,@uvI) cards=(list card)]
=+ ^= new-vane
%- (hard ,@uvI)
.^(%cz /(scot %p our)/home/(scot %da now)/arvo/[syd]/hoon)
?: =(`new-vane (~(get by cur-vanes) syd))
[cur-vanes cards]
:- (~(put by cur-vanes) syd new-vane)
[[%poke /kiln/reload/[syd] [our %hood] %helm-reload ~[syd]] cards]
=. +>.$ =. +>.$
%- emit :* %- emit :*
%warp /kiln/autoload/[syd] [our our] %home ~ %warp /kiln/autoload [our our] %home ~
%next %z da/now /arvo/[syd]/hoon %next %z da/now /arvo
== ==
abet abet
:: ::
@ -392,7 +438,7 @@
:: ::
++ perform :: ++ perform ::
^+ . ^+ .
(blab =-(~&([%blabbing -] -) [ost %merg /kiln/[syd] our syd her sud cas gem]) ~) (blab [ost %merg /kiln/[syd] our syd her sud cas gem] ~)
:: ::
++ fancy-merge :: send to self ++ fancy-merge :: send to self
|= [syd=desk her=@p sud=desk gem=?(%auto germ)] |= [syd=desk her=@p sud=desk gem=?(%auto germ)]

7
mar/hook.hoon
View File

@ -36,16 +36,13 @@
;script:'CodeMirror.fromTextArea(src, {lineNumbers:true, readOnly:true})' ;script:'CodeMirror.fromTextArea(src, {lineNumbers:true, readOnly:true})'
== ==
== ==
++ txt (lore (cat 3 own '\0a')) ++ txt (lore own)
-- --
++ grab ++ grab
|% :: convert from |% :: convert from
++ mime |=([p=mite q=octs] q.q) ++ mime |=([p=mite q=octs] q.q)
++ noun ,@t :: clam from %noun ++ noun ,@t :: clam from %noun
++ txt ++ txt role
|= wan=wain
=+ (role wan)
(end 3 (dec (met 3 -)) -)
-- --
++ grad %txt ++ grad %txt
-- --

8
mar/hoon.hoon
View File

@ -37,17 +37,13 @@
== ==
== ==
++ txt ++ txt
(lore (cat 3 own '\0a')) (lore own)
-- --
++ grab ++ grab
|% :: convert from |% :: convert from
++ mime |=([p=mite q=octs] q.q) ++ mime |=([p=mite q=octs] q.q)
++ noun ,@t :: clam from %noun ++ noun ,@t :: clam from %noun
++ txt ++ txt role
|= wan=wain
^- @t
=+ (role wan)
(end 3 (dec (met 3 -)) -)
-- --
++ grad %txt ++ grad %txt
-- --

7
mar/markdown.hoon
View File

@ -9,17 +9,14 @@
++ mime [/text/x-markdown (taco mud)] ++ mime [/text/x-markdown (taco mud)]
++ md mud ++ md mud
++ txt ++ txt
(lore (cat 3 mud '\0a')) (lore mud)
-- --
++ grab ++ grab
|% |%
++ mime |=([p=mite q=octs] q.q) ++ mime |=([p=mite q=octs] q.q)
++ noun ,@t ++ noun ,@t
++ md |=(@t +<) ++ md |=(@t +<)
++ txt ++ txt role
|= wan=wain
=+ (role wan)
(end 3 (dec (met 3 -)) -)
-- --
++ grad %txt ++ grad %txt
-- --

7
mar/md.hoon
View File

@ -8,16 +8,13 @@
|% |%
++ mime [/text/x-markdown (taco mud)] ++ mime [/text/x-markdown (taco mud)]
++ txt ++ txt
(lore (cat 3 mud '\0a')) (lore mud)
-- --
++ grab ++ grab
|% |%
++ mime |=([p=mite q=octs] q.q) ++ mime |=([p=mite q=octs] q.q)
++ noun ,@t ++ noun ,@t
++ txt ++ txt role
|= wan=wain
=+ (role wan)
(end 3 (dec (met 3 -)) -)
-- --
++ grad %txt ++ grad %txt
-- --

4
pub/bit/fab/hymn.hook
View File

@ -24,9 +24,9 @@
;script: authcode = {(pojo %s authcode)} ;script: authcode = {(pojo %s authcode)}
;script:''' ;script:'''
if (authcode) if (authcode)
urb.send({ urb.send(authcode,
{
appl: "bit", appl: "bit",
data: authcode,
mark: "oauth2-code" mark: "oauth2-code"
}, function(){ }, function(){
}) })

2
pub/docs/user/appliance.md
View File

@ -83,7 +83,7 @@ possible; it's not well-optimized.
There's a web interface to `:talk` at There's a web interface to `:talk` at
http://localhost:8080/~~/home/pub/talk/fab http://localhost:8080/~~/home/pub/talk
and a dojo interface at and a dojo interface at

11
pub/docs/user/talk.md
View File

@ -75,7 +75,7 @@ You'll see:
---------:talk| don't be rude ---------:talk| don't be rude
---------:talk| urbit-meta is politically correct and safe for work ---------:talk| urbit-meta is politically correct and safe for work
~doznec= ~fintud-macrep admitted to %urbit-meta ~doznec= ~fintud-macrep admitted to %urbit-meta
~fintud-macrep:talk= ~fintud-macrep:talk>
Notice the character assignment - stations you're subscribed to are Notice the character assignment - stations you're subscribed to are
assigned [consistent ASCII glyphs](#-station-glyphs), which you'll assigned [consistent ASCII glyphs](#-station-glyphs), which you'll
@ -84,16 +84,16 @@ when you're talking to them.
Post a line to `/urbit-meta`: Post a line to `/urbit-meta`:
~fintud-macrep:talk= hello, world ~fintud-macrep:talk> hello, world
You'll see, echoed back at you through `~doznec`: You'll see, echoed back at you through `~doznec`:
~fintud-macrep:talk= hello, world ~fintud-macrep> hello, world
And of course, anyone else in `/urbit-meta` will see it as well. And of course, anyone else in `/urbit-meta` will see it as well.
But you don't care about `/urbit-meta`, so leave it: But you don't care about `/urbit-meta`, so leave it:
~fintud-macrep:talk= ;leave ~fintud-macrep:talk> ;leave >
You'll see: You'll see:
@ -103,7 +103,6 @@ Everyone else will see:
~doznec= ~fintud-macrep has left %urbit-meta ~doznec= ~fintud-macrep has left %urbit-meta
Now you're ready to use `:talk` for real! For general discussion Now you're ready to use `:talk` for real! For general discussion
about Urbit, we recommend `/urbit-meta`. about Urbit, we recommend `/urbit-meta`.
@ -234,7 +233,7 @@ most recent; etc.
### Nicknames ### Nicknames
<mark>Partially implemented</mark> <mark>Implemented, no autocompletion</mark>
Sometimes you know your Urbit friends by other names, on or Sometimes you know your Urbit friends by other names, on or
offline. Use the `;nick` command to assign or look up offline. Use the `;nick` command to assign or look up

0
pub/talk/src/js/.main.js
View File