From 172e6ba6bedf7eb362560e20359cee5aa840a366 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 2 Dec 2011 16:13:55 +0100 Subject: //assets ass: add TODOs --- assets/bin/ass | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'assets') diff --git a/assets/bin/ass b/assets/bin/ass index d29ea7e6..27e5c6f3 100755 --- a/assets/bin/ass +++ b/assets/bin/ass @@ -2,6 +2,11 @@ set -euf +# TODO REPO=... +# TODO check if $REPO is the right one +# TODO sanity-check arguments +# TODO commit changes; pull and push $REPO + JOURNAL="/krebs/db/truth" METHOD="$1" -- cgit v1.2.3 From ad8a9d03993ade25f84a6ce0a1be6d7303fedc65 Mon Sep 17 00:00:00 2001 From: EUcancER Date: Wed, 7 Dec 2011 13:02:54 +0100 Subject: //assets/bin: add truth2json,check-truth truth2json converts the truth-db into json, fails hard when the database is malformed check-truth takes a line to add to the truth from stdin and calls truth2json to check the sanity of the database-to-be --- assets/bin/check-truth | 11 +++++++++++ assets/bin/truth2json | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100755 assets/bin/check-truth create mode 100755 assets/bin/truth2json (limited to 'assets') diff --git a/assets/bin/check-truth b/assets/bin/check-truth new file mode 100755 index 00000000..88246a54 --- /dev/null +++ b/assets/bin/check-truth @@ -0,0 +1,11 @@ +#!/bin/sh +set -euf +DB=${1-"/krebs/db/truth"} +HERE=$(dirname $(readlink -f $0)) +read LINE +if (cat $DB;echo $LINE) | $HERE/truth2json - >/dev/null ;then + echo "success" +else + echo "you fail" +fi + diff --git a/assets/bin/truth2json b/assets/bin/truth2json new file mode 100755 index 00000000..c1aac73c --- /dev/null +++ b/assets/bin/truth2json @@ -0,0 +1,37 @@ +#!/usr/bin/python + +import sys + +try: + db=sys.argv[1] +except: + db="/krebs/db/truth" + +ret = {} + + +if db is "-": + sys.stderr.write("Using stdin\n") + f = sys.stdin +else: + sys.stderr.write("Using journal '%s'\n" % db) + f = open(db) + +for line in f: + lsplit = line.split() + date = ' '.join(lsplit[0:2]) + cmd = lsplit[2] + target = lsplit[3] + if cmd == "create": + assert target not in ret, "Target '%s' already created!" + ret[target] = {} + elif cmd == "set": + key = lsplit[4] + value = ' '.join(lsplit[5:]) + assert target in ret, "target '%s' not set yet!" % target + ret[target][key] = value + else: + raise AssertionError,"unknown command '%s'!" + +import json +print json.dumps(ret,sort_keys=True,indent=4) -- cgit v1.2.3 From dc9f6a510182b6947a8ee58b1940dd4ce2a32fd7 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 7 Dec 2011 13:23:04 +0100 Subject: //assets: check-truth prints line when successful --- assets/bin/check-truth | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'assets') diff --git a/assets/bin/check-truth b/assets/bin/check-truth index 88246a54..6b55fdcd 100755 --- a/assets/bin/check-truth +++ b/assets/bin/check-truth @@ -3,9 +3,9 @@ set -euf DB=${1-"/krebs/db/truth"} HERE=$(dirname $(readlink -f $0)) read LINE -if (cat $DB;echo $LINE) | $HERE/truth2json - >/dev/null ;then - echo "success" +if (cat $DB;echo $LINE) | $HERE/truth2json - 1>/dev/null ;then + echo "success" 1>&2 + echo "$LINE" else - echo "you fail" + echo "you fail" 1>&2 fi - -- cgit v1.2.3