hen-list-tubes-watched should return list instead of alist

Updated test case to reflect new semantics.

git-svn-id: https://code.call-cc.org/svn/chicken-eggs/release/4/hen/trunk@23233 fca3e652-9b03-0410-8d7b-ac86a6ce46c4

hen.scm

@@ -49,7 +49,7 @@
 
 (import scheme chicken)
 
-(use chicken data-structures extras lambda+ list-utils miscmacros regex srfi-1 tcp6)
+(use chicken data-structures extras lambda+ list-utils miscmacros regex srfi-1 srfi-13 tcp6)
 
 (import-for-syntax chicken)
 
@@ -121,8 +121,8 @@
             (define-hen-command command-2  (arg-2 ...) ...)
       ...)]))
 
-(define (read-stats res tcp-in)
-  (if* (second-match "^OK (\\d+)$" res) (parse-yaml (read-string (string->number it) tcp-in))))
+(define (read-stats res tcp-in #!optional (parser parse-yaml-alist))
+  (if* (second-match "^OK (\\d+)$" res) (parser (read-string (string->number it) tcp-in))))
 
 (define-hen-command-list
   [use (tube)]
@@ -142,7 +142,7 @@
   [stats () (read-stats res tcp-in)]
   [list-tubes () (read-stats res tcp-in)]
   [list-tube-used ()]
-  [list-tubes-watched () (read-stats res tcp-in)]
+  [list-tubes-watched () (read-stats res tcp-in parse-yaml-list)]
   [quit ()]
   [pause-tube (tube delay)])
 

hen.utils.scm

@@ -28,5 +28,8 @@
        #f))
 
 ;; this parses beanstalk's yaml, nothing generic intended
-(define (parse-yaml yaml)
+(define (parse-yaml-alist yaml)
   (plist->alist (flatten (cdr (filter-map (lambda (s) (string-split s ": ")) (string-split yaml "\n"))))))
+
+(define (parse-yaml-list yaml)
+  (cdr (map (cut string-drop <> 2) (string-split yaml "\n"))))

tests/run.scm

@@ -30,7 +30,7 @@
 (test-begin "all commands with dummy data")
 
 (test "zero param commands"
-      '("OK 13" "OK 13" "OK 13" (("test" . "data")) "OK 13" (("test" . "data")) (("test" . "data")) "OK 13")
+      '("OK 13" "OK 13" "OK 13" (("test" . "data")) "OK 13" (("test" . "data")) ("st:data") "OK 13")
       (map (lambda (p) (p #:tcp-in (open-input-string "OK 13\r\n---\ntest:data\r\n") #:tcp-out (open-output-string))) command-list-0))
 
 (test "single param commands"