steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://factorcode.org/git/factor

db4
Slava Pestov 2009-03-23 22:40:45 -05:00
parent ed9c5f3cad 862223fa79
commit e1f6bdc04e
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
basis/tools/deploy/shaker/shaker.factor
View File

@ -204,7 +204,8 @@ IN: tools.deploy.shaker
] when ; ] when ;
: strip-vocab-globals ( except names -- words ) : strip-vocab-globals ( except names -- words )
[ child-vocabs [ words ] map concat ] map concat swap diff ; [ child-vocabs [ words ] map concat ] map concat
swap [ first2 lookup ] map sift diff ;
: stripped-globals ( -- seq ) : stripped-globals ( -- seq )
[ [
@ -245,7 +246,8 @@ IN: tools.deploy.shaker
strip-dictionary? [ strip-dictionary? [
"libraries" "alien" lookup , "libraries" "alien" lookup ,
{ } { "cpu" "compiler" } strip-vocab-globals % { { "yield-hook" "compiler.utilities" } }
{ "cpu" "compiler" } strip-vocab-globals %
{ {
gensym gensym

10
extra/site-watcher/site-watcher-tests.factor
View File

@ -2,11 +2,14 @@
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: db.tuples locals site-watcher site-watcher.db USING: db.tuples locals site-watcher site-watcher.db
site-watcher.private kernel db io.directories io.files.temp site-watcher.private kernel db io.directories io.files.temp
continuations db.sqlite site-watcher.db.private ; continuations site-watcher.db.private db.sqlite
sequences tools.test ;
IN: site-watcher.tests IN: site-watcher.tests
[ "site-watcher.db" temp-file delete-file ] ignore-errors
:: fake-sites ( -- seq ) :: fake-sites ( -- seq )
[ "site-watcher.db" temp-file <sqlite-db> [
account ensure-table account ensure-table
site ensure-table site ensure-table
watching-site ensure-table watching-site ensure-table
@ -17,5 +20,6 @@ IN: site-watcher.tests
"erg@factorcode.org" "http://asdfasdfasdfasdfqwerqqq.com" watch-site "erg@factorcode.org" "http://asdfasdfasdfasdfqwerqqq.com" watch-site
f <site> select-tuples f <site> select-tuples
] with-sqlite-db ; ] with-db ;
[ f ] [ fake-sites empty? ] unit-test