Overview
Comment: | Automated merge of v1.63-xor-report/f2807ed766/integ into integ-home |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | integ-home |
Files: | files | file ages | folders |
SHA1: |
4008bc5f1aa98e6d717c71c948533067 |
User & Date: | matt on 2017-01-24 12:14:41 |
Other Links: | branch diff | manifest | tags |
Context
2017-01-25
| ||
17:37 | Automated merge of v1.63/e58c0e3fb7/integ into integ-home check-in: 6e5448c9cf user: matt tags: integ-home | |
2017-01-24
| ||
12:14 | Automated merge of v1.63-xor-report/f2807ed766/integ into integ-home check-in: 4008bc5f1a user: matt tags: integ-home | |
11:52 | added ducttape lib; got emailing html report working and first pass stml tables for diff report check-in: f2807ed766 user: bjbarcla tags: v1.63-xor-report | |
2017-01-23
| ||
16:56 | Automated merge of pjhatwal/3585f5b63a/integ into integ-home check-in: 447f505fd0 user: matt tags: integ-home | |
Changes
Modified diff-report.scm from [a36e7cf304] to [a41689ce94].
︙ | ︙ | |||
11 12 13 14 15 16 17 18 19 20 21 22 23 24 | ;; #;; (rmt:get-test-info-by-id run-id test-id) ;; #;; (rmt:get-tests-for-run run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode) ;; megatest -repl << EOF ;; TODO:dashboard not on homehost message exit (use matchable) (define (tests-mindat->hash tests-mindat) (let* ((res (make-hash-table))) (for-each (lambda (item) (let* ((test-name+item-path (cons (list-ref item 0) (list-ref item 1))) (value (list-ref item 2))) | > > > > | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | ;; #;; (rmt:get-test-info-by-id run-id test-id) ;; #;; (rmt:get-tests-for-run run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode) ;; megatest -repl << EOF ;; TODO:dashboard not on homehost message exit (use matchable) (use ducttape-lib) (define css "") (use matchable) (define (tests-mindat->hash tests-mindat) (let* ((res (make-hash-table))) (for-each (lambda (item) (let* ((test-name+item-path (cons (list-ref item 0) (list-ref item 1))) (value (list-ref item 2))) |
︙ | ︙ | |||
62 63 64 65 66 67 68 | )))) (let ((res (map ;; TODO: rename xor to delta globally in dcommon and dashboard (lambda (key) (let* ((test-name (car key)) (item-path (cdr key)) | | | | | | | | | | | | | | | < | 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 | )))) (let ((res (map ;; TODO: rename xor to delta globally in dcommon and dashboard (lambda (key) (let* ((test-name (car key)) (item-path (cdr key)) (dest-value (hash-table-ref/default dest-hash key (list #f #f #f))) ;; (list test-id state status) (dest-test-id (list-ref dest-value 0)) (dest-state (list-ref dest-value 1)) (dest-status (list-ref dest-value 2)) (src-value (hash-table-ref/default src-hash key (list #f #f #f))) ;; (list test-id state status) (src-test-id (list-ref src-value 0)) (src-state (list-ref src-value 1)) (src-status (list-ref src-value 2)) (incomplete-statuses '("DELETED" "INCOMPLETE" "STUCK/DEAD" "N/A")) ;; if any of these statuses apply, treat test as incomplete (dest-complete (and dest-value dest-state dest-status (equal? dest-state "COMPLETED") (not (member dest-status incomplete-statuses)))) (src-complete (and src-value src-state src-status (equal? src-state "COMPLETED") (not (member src-status incomplete-statuses)))) (status-compare-result (status-compare3 src-status dest-status)) (xor-new-item (cond ;; complete, for this case means: state=compelte AND status not in ( deleted uncomplete stuck/dead n/a ) ;; neither complete -> bad ;; src !complete, dest complete -> better ((and (not dest-complete) (not src-complete)) (list dest-test-id "BOTH-BAD" "BOTH-INCOMPLETE") src-value dest-value) ((not dest-complete) (list src-test-id "DIFF-MISSING" "DEST-INCOMPLETE") src-value dest-value) ((not src-complete) (list dest-test-id "DIFF-NEW" "SRC-INCOMPLETE") src-value dest-value) ((and (equal? src-state dest-state) (equal? src-status dest-status)) (list dest-test-id (conc "CLEAN") (conc "CLEAN-" dest-status) src-value dest-value)) ;; better or worse: pass > warn > waived > skip > fail > abort ;; pass > warn > waived > skip > fail > abort ((= 1 status-compare-result) ;; src is better, dest is worse (list dest-test-id "DIRTY-WORSE" (conc src-status "->" dest-status) src-value dest-value)) (else (list dest-test-id "DIRTY-BETTER" (conc src-status "->" dest-status) src-value dest-value))))) (list test-name item-path xor-new-item))) all-keys))) (if hide-clean (filter (lambda (item) (not |
︙ | ︙ | |||
183 184 185 186 187 188 189 | (lambda (x) (equal? (list-ref (caddr x) 1) state)) run-diff)) (define (summarize-run-diff run-diff) (let* ((diff-states (list "CLEAN" "DIRTY-BETTER" "DIRTY-WORSE" "BOTH-BAD" "DIFF-MISSING" "DIFF-NEW" ))) | | | | > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > > | > > | > > > | > | 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 | (lambda (x) (equal? (list-ref (caddr x) 1) state)) run-diff)) (define (summarize-run-diff run-diff) (let* ((diff-states (list "CLEAN" "DIRTY-BETTER" "DIRTY-WORSE" "BOTH-BAD" "DIFF-MISSING" "DIFF-NEW" ))) (map (lambda (state) (list state (length (rundiff-find-by-state run-diff state)))) diff-states))) (define (stml->string in-stml) (with-output-to-string (lambda () (s:output-new (current-output-port) in-stml)))) (define (test-state-status->diff-report-cell state status) (s:td status)) (define (diff-state-status->diff-report-cell state status) (s:td state 'bgcolor "#33ff33")) (define (run-diff->diff-report src-runname dest-runname run-diff) (let* ((test-count (length run-diff)) (summary-table (apply s:table 'cellspacing "0" 'border "1" (s:tr (s:th "Diff type") (s:th "% share") (s:th "Count")) (map (lambda (state-count) (s:tr (s:td (car state-count)) (s:td (* 100 (/ (cadr state-count) test-count))) (s:td (cadr state-count)))) (summarize-run-diff run-diff)))) (main-table (apply s:table 'cellspacing "0" 'border "1" (s:tr (s:th "Test name") (s:th "Item Path") (s:th (conc "Source=" src-runname)) (s:th (conc "Dest=" dest-runname)) (s:th "Diff")) (map (lambda (run-diff-item) (match run-diff-item ((test-name item-path (junk-id diff-state diff-status (src-test-id src-state src-status) (dest-test-id dest-state dest-status))) (s:tr (s:td test-name) (s:td item-path) (test-state-status->diff-report-cell src-state src-status) (test-state-status->diff-report-cell dest-state dest-status) (diff-state-status->diff-report-cell diff-state diff-status))) (else ""))) (filter (lambda (run-diff-item) (match run-diff-item ((test-name item-path (junk-id diff-state diff-status (src-test-id src-state src-status) (dest-test-id dest-state dest-status))) (not (equal? diff-state "CLEAN"))) (else #f))) run-diff))))) (stml->string (s:body summary-table main-table)))) (let* ((src-runname "all57") (dest-runname "all60") (to "bjbarcla") (subj (conc "[MEGATEST DIFF] "src-runname" vs. "dest-runname)) (run-diff (diff-runs src-runname dest-runname)) (diff-summary (summarize-run-diff run-diff)) (html-report (run-diff->diff-report src-runname dest-runname run-diff))) ;;(pretty-print run-diff) ;;(pretty-print diff-summary) (sendmail to subj html-report use_html: #t) ;;(print html-report) ) ;; (match de ;; ((test-name test-path ( test-id "BOTH-BAD" test-status)) test-path) ;; (else #f)) |
Modified ducttape/Makefile from [e0a1c0008a] to [4c52034a48].
︙ | ︙ | |||
8 9 10 11 12 13 14 | @echo "test - run unit tests on ducttape-lib.scm (tests code, not egg)" @echo "eggs-info - show chicken-install commands to get eggs upon which ducttape-lib depends" @echo "test_example - compile an example scm against installed general_lib egg" @echo "clean - remove binaries and other build artifacts" @echo "" clean: | | | < | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | @echo "test - run unit tests on ducttape-lib.scm (tests code, not egg)" @echo "eggs-info - show chicken-install commands to get eggs upon which ducttape-lib depends" @echo "test_example - compile an example scm against installed general_lib egg" @echo "clean - remove binaries and other build artifacts" @echo "" clean: rm -f *.so *.import.scm test_ducttape test_example foo *.c *.o install: chicken-install test: chicken-install -no-install csc test_ducttape.scm ./test_ducttape if (-e foo) rm -f foo test_example: @csc test_example.scm @./test_example @rm test_example |
︙ | ︙ |
Modified ducttape/ducttape-lib.scm from [d048a5116f] to [e6c61f0839].
|
| | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > > > > > > | > > > > > > | > > > > > > | > > > > > > | > > > > > > > > > > > > > > > > > > | | > > > > > > | > > | | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 | (module ducttape-lib ( runs-ok ducttape-debug-level ducttape-debug-regex-filter ducttape-silent-mode ducttape-quiet-mode ducttape-log-file ducttape-color-mode iputs-preamble script-name idbg ierr iwarn inote iputs re-match? ; launch-repl keyword-skim skim-cmdline-opts-noarg-by-regex skim-cmdline-opts-withargs-by-regex concat-lists process-command-line ducttape-append-logfile ducttape-activate-logfile isys do-or-die counter-maker dir-is-writable? mktemp get-tmpdir sendmail find-exe zeropad string-leftpad string-rightpad seconds->isodate seconds->wwdate seconds->wwdate-values isodate->seconds isodate->wwdate wwdate->seconds wwdate->isodate current-wwdate current-isodate ) (import scheme chicken extras ports data-structures ) (use posix regex ansi-escape-sequences test srfi-1 irregex slice srfi-13 rfc3339 scsh-process directory-utils uuid-lib filepath srfi-19 ) ; linenoise (include "mimetypes.scm") ; provides ext->mimetype (include "workweekdate.scm") (define ducttape-lib-version 1.00) (define (toplevel-command sym proc) (lambda () #f)) ;;;; utility procedures ;; begin credit: megatest's process.scm (define (port->list fh ) (if (eof-object? fh) #f (let loop ((curr (read-line fh)) (result '())) (if (not (eof-object? curr)) (loop (read-line fh) (append result (list curr))) result)))) (define (conservative-read port) (let loop ((res "")) (if (not (eof-object? (peek-char port))) (loop (conc res (read-char port))) res))) ;; end credit: megatest's process.scm (define (counter-maker) (let ((acc 0)) (lambda ( #!optional (increment 1) ) (set! acc (+ increment acc)) acc))) (define (port->string port #!optional ) ; todo - add newline (let ((linelist (port->list port))) (if linelist (string-join linelist "\n") ""))) (define (outport->foreach outport foreach-thunk) (let loop ((line (foreach-thunk))) (if line (begin (write-line line outport) (loop (foreach-thunk)) ) (begin ;;http://bugs.call-cc.org/ticket/766 ;;close-[input|output]-port implicitly calling process-wait on process pipe ports. This leads to errors like ;;Error: (process-wait) waiting for child process failed - No child processes: 10872 (close-output-port outport) #f)))) ;; weird - alist-ref arg order changes signature csc vs. csi... explitly defining. (define (my-alist-ref key alist) (let ((res (assoc key alist))) (if res (cdr res) #f))) (define (keyword-skim-alist args alist) (let loop ((result-alist '()) (result-args args) (rest-alist alist)) (cond ((null? rest-alist) (values result-alist result-args)) (else (let ((keyword (caar rest-alist)) (defval (cdar rest-alist))) (let-values (((kwval result-args2) (keyword-skim keyword defval result-args))) (loop (cons (cons keyword kwval) result-alist) result-args2 (cdr rest-alist)))))))) (define (isys command . rest-args) (let-values (((opt-alist args) (keyword-skim-alist rest-args '( ( foreach-stdout-thunk: . #f ) ( foreach-stdin-thunk: . #f ) ( stdin-proc: . #f ) ) ))) (let* ((foreach-stdout-thunk (my-alist-ref foreach-stdout-thunk: opt-alist)) (foreach-stdin-thunk (my-alist-ref foreach-stdin-thunk: opt-alist)) (stdin-proc (if foreach-stdin-thunk (lambda (port) (outport->foreach port foreach-stdin-thunk)) (my-alist-ref stdin-proc: opt-alist)))) ;; TODO: support command is list. (let-values (((stdout stdin pid stderr) (if (null? args) (process* command) (process* command args)))) ;(if foreach-stdin-thunk ; (set! stdin-proc ; (lambda (port) ; (outport->foreach port foreach-stdin-thunk)))) (if stdin-proc (stdin-proc stdin)) (let ((stdout-res (if foreach-stdout-thunk ;; don't accumulate stdout if we have a thunk; probably doing this because stdout is BIG so lets not waste memory (begin (port-for-each foreach-stdout-thunk (lambda () (read-line stdout))) "foreach-stdout-thunk ate stdout" ) (if stdin-proc "foreach-stdin-thunk/stdin-proc blocks stdout" (port->string stdout)))) (stderr-res (if stdin-proc "foreach-stdin-thunk/stdin-proc blocks stdout" (port->string stderr)))) ;; if we've used a stdin-proc, we've closed stdin port, which unfortunately causes a wait-pid internally, causing stdout and stderr ports to auto-close. don't close them again. (so sad - we lost stdout and stderr contents when we write to stdin) ;; see - http://bugs.call-cc.org/ticket/766 (if (not stdin-proc) (close-input-port stdout) (close-input-port stderr)) (let-values (((anotherpid normalexit? exitstatus) (process-wait pid))) (values exitstatus stdout-res stderr-res))))))) (define (do-or-die command #!key nodie (foreach-stdout #f) (stdin-proc #f)) (let-values (((exit-code stdout-str stderr-str) (isys command foreach-stdout-thunk: foreach-stdout stdin-proc: stdin-proc ))) (if (equal? 0 exit-code) stdout-str (begin (ierr (conc "Command > " command " " "< failed with " exit-code " because: \n" stderr-str) ) (if nodie #f (exit exit-code)))))) ;; this is broken. one day i will fix it and thus understand run/collecting... don't use isys-broken. (define (isys-broken command-list) (let-values ( ( (rv outport errport) (run/collecting (1 2) ("ls" "-l") ) ) ) (print "rv is " rv) (print "op is " outport) (print "ep is " errport) (values rv (port->string outport) (port->string errport)))) ;; runs-ok: evaluate expression while suppressing exceptions. ; on caught exception, returns #f ; otherwise, returns expression value (define (runs-ok thunk) (handle-exceptions exn #f (begin (thunk) #t))) ;; concat-lists: result list = lista + listb (define (concat-lists lista listb) ;; ok, I just reimplemented append... (foldr cons listb lista)) ;;; setup general_lib env var parameters ;; show warning/note/error/debug prefixes using ansi colors (define ducttape-color-mode (make-parameter (get-environment-variable "DUCTTAPE_COLORIZE"))) ;; if defined, has number value. if number value > 0, show debug messages ;; value should be decremented in subshells -- idea is raising debug level will show debug messages deeper and deeper in process call stack (define ducttape-debug-level (make-parameter (let ( (raw-debug-level (get-environment-variable "DUCTTAPE_DEBUG_LEVEL")) ) (if raw-debug-level (let ((num-debug-level (runs-ok (string->number raw-debug-level)))) (if (integer? num-debug-level) (begin (let ((new-num-debug-level (- num-debug-level 1))) (if (> new-num-debug-level 0) ;; decrement (setenv "DUCTTAPE_DEBUG_LEVEL" (number->string new-num-debug-level)) (unsetenv "DUCTTAPE_DEBUG_LEVEL"))) num-debug-level) ; it was set and > 0, mode is value (begin (unsetenv "DUCTTAPE_DEBUG_LEVEL") ;; value was invalid, unset it #f))) ; value was invalid, mode is f #f)))) ; var not set, mode is f (define ducttape-debug-mode (if (ducttape-debug-level) #t #f)) ;; ducttape-debug-regex-filter suppresses non-matching debug messages (define ducttape-debug-regex-filter (make-parameter (let ((raw-debug-pattern (get-environment-variable "DUCTTAPE_DEBUG_PATTERN"))) (if raw-debug-pattern raw-debug-pattern ".")))) ;; silent mode suppresses Note and Warning type messages (define ducttape-silent-mode (make-parameter (get-environment-variable "DUCTTAPE_SILENT_MODE"))) ;; quiet mode suppresses Note type messages (define ducttape-quiet-mode (make-parameter (get-environment-variable "DUCTTAPE_QUIET_MODE"))) ;; if log file is defined, warning/note/error/debug messages are appended ;; to named logfile. (define ducttape-log-file (make-parameter (get-environment-variable "DUCTTAPE_LOG_FILE"))) ;;; standard messages printing implementation ; get the name of the current script/binary being run (define (script-name) (car (reverse (string-split (car (argv)) "/")))) (define (ducttape-timestamp) (rfc3339->string (time->rfc3339 (seconds->local-time)))) (define (iputs-preamble msg-type #!optional (suppress-color #f)) (let ((do-color (and (not suppress-color) (ducttape-color-mode) (terminal-port? (current-error-port))))) (case msg-type ((note) (if do-color (set-text (list 'fg-green 'bg-black 'bold) "Note:") "Note:" )) ((warn) (if do-color (set-text (list 'fg-yellow 'bg-black 'bold) "Warning:") "Warning:" )) ((err) (if do-color (set-text (list 'fg-red 'bg-black 'bold) "Error:") "Error:" )) ((dbg) (if do-color (set-text (list 'fg-blue 'bg-magenta) "Debug:") "Debug:" ))))) (define (ducttape-append-logfile msg-type message #!optional (suppress-preamble #f)) (let ((txt (string-join (list (ducttape-timestamp) (script-name) (if suppress-preamble message (string-join (list (iputs-preamble msg-type #t) message) " "))) " | "))) (if (ducttape-log-file) (runs-ok (call-with-output-file (ducttape-log-file) (lambda (output-port) (format output-port "~A ~%" txt) ) #:append)) #t))) (define (ducttape-activate-logfile #!optional (logfile #f)) ;; from python ducttape-lib.py ; message = "START - pid=%d ppid=%d argv=(%s) pwd=%s user=%s host=%s"%(pid,ppid," ".join("'"+x+"'" for x in sys.argv),os.environ['PWD'],os.getenv('USER','nouser'),os.getenv('HOST','nohost') ) (let ((pid (number->string (current-process-id))) (ppid (number->string (parent-process-id))) (argv (string-join (map (lambda (x) (string-join (list "\"" x "\"") "" )) (argv)) " ")) (pwd (or (get-environment-variable "PWD") "nopwd")) (user (or (get-environment-variable "USER") "nouser")) (host (or (get-environment-variable "HOST") "nohost"))) (if logfile (begin (ducttape-log-file logfile) (setenv "DUCTTAPE_LOG_FILE" (ducttape-log-file)))) (ducttape-append-logfile 'note (format #f "START - pid=~A ppid=~A argv=(~A) pwd=~A user=~A host=~A" pid ppid argv pwd user host) #t))) ;; immediately activate logfile (will be noop if logfile disabled) (ducttape-activate-logfile) ;; log exit code (define (set-exit-handler) (let ((orig-exit-handler (exit-handler))) (exit-handler (lambda (exitcode) (ducttape-append-logfile 'note (format #f "Exit ~A by sys.exit" exitcode) #t) (orig-exit-handler exitcode))))) (set-exit-handler) ;; TODO: hook exception handler so we can log exception before we sign off. (define (idbg first-message . rest-args) (let* ((debug-level-threshold (if (> (length rest-args) 0) (car rest-args) 1)) (message-list (if (> (length rest-args) 1) (cons first-message (cdr rest-args)) (list first-message)) ) (message (apply conc (map ->string message-list)))) (ducttape-append-logfile 'dbg message) (if (ducttape-debug-level) (if (<= debug-level-threshold (ducttape-debug-level)) (if (string-search (ducttape-debug-regex-filter) message) (begin (format (current-error-port) "~A ~A (~A)~%" (iputs-preamble 'dbg) message (script-name)))))))) (define (ierr message-first . message-rest) (let* ((message (apply conc (map ->string (cons message-first message-rest))))) (ducttape-append-logfile 'err message) (format (current-error-port) "~A ~A (~A)~%" (iputs-preamble 'err) message (script-name)))) (define (iwarn message-first . message-rest) (let* ((message (apply conc (map ->string (cons message-first message-rest))))) (ducttape-append-logfile 'warn message) (if (not (ducttape-silent-mode)) (begin (format (current-error-port) "~A ~A (~A)~%" (iputs-preamble 'warn) message (script-name)))))) (define (inote message-first . message-rest) (let* ((message (apply conc (map ->string (cons message-first message-rest))))) (ducttape-append-logfile 'note message) (if (not (or (ducttape-silent-mode) (ducttape-quiet-mode))) (begin (format (current-error-port) "~A ~A (~A)~%" (iputs-preamble 'note) message (script-name)))))) (define (iputs kind message #!optional (debug-level-threshold 1)) (cond ((member kind (string-split "NOTE/Note/note/n/N" "/")) (inote message)) ((member kind (string-split "Error/ERROR/error/Err/ERR/err/E/e" "/")) (ierr message)) ((member kind (string-split "Warning/WARNING/warning/Warn/WARN/warn/W/w" "/")) (iwarn message)) ((member kind (string-split "Debug/DEBUG/debug/Dbg/DBG/dbg/D/d" "/")) (idbg message debug-level-threshold)))) (define (mkdir-recursive path-so-far hier-list-to-create) (if (null? hier-list-to-create) path-so-far (let* ((next-hier-item (car hier-list-to-create)) (rest-hier-items (cdr hier-list-to-create)) (path-to-mkdir (string-concatenate (list path-so-far "/" next-hier-item)))) (if (runs-ok (lambda () (create-directory path-to-mkdir))) (mkdir-recursive path-to-mkdir rest-hier-items) #f)))) ; ::mkdir-if-not-exists:: ; make a dir recursively if it does not ; already exist. ; on success - returns path ; on fail - returns #f (define (mkdirp-if-not-exists the-dir) (let ( (path-list (string-split the-dir "/"))) (mkdir-recursive "/" path-list))) ; ::mkdir-if-not-exists:: ; make a dir recursively if it does not ; already exist. ; on success - returns path ; on fail - returns #f (define (mkdirp-if-not-exists the-dir) (let ( (path-list (string-split the-dir "/"))) (mkdir-recursive "/" path-list))) (define (dir-is-writable? the-dir) (let ((dummy-file (string-concatenate (list the-dir "/.dummyfile")))) (and (file-exists? the-dir) (cond ((runs-ok (lambda ()(with-output-to-file dummy-file (lambda () (print "foo"))))) (begin (runs-ok (lambda () (delete-file dummy-file) )) the-dir)) (else #f))))) (define (get-tmpdir ) (let* ((tmproot (dir-is-writable? (or (get-environment-variable "TMPDIR") "/tmp"))) (user (or (get-environment-variable "USER") "USER_Envvar_not_set")) (tmppath (string-concatenate (list tmproot "/env21-general-" user )))) (dir-is-writable? (mkdirp-if-not-exists tmppath)))) (define (mktemp #!optional (prefix "general_lib_tmpfile") (dir #f)) (let-values (((fd path) (file-mkstemp (conc (if dir dir (get-tmpdir)) "/" prefix ".XXXXXX")))) (close-output-port (open-output-file* fd)) path)) ;;http://stackoverflow.com/questions/11134857/using-sendmail-for-html-body-and-binary-attachment ;; write send-email using: ;; - isys-foreach-stdin-line ;; - formatting in http://stackoverflow.com/questions/11134857/using-sendmail-for-html-body-and-binary-attachment (define (sendmail to_addr subject body #!key (from_addr "admin") cc_addr bcc_addr more-headers use_html (attach-files-list '())) (define (sendmail-proc sendmail-port) (define (wl line-str) (write-line line-str sendmail-port)) (define (get-uuid) (string-upcase (uuid->string (uuid-generate)))) (let ((mailpart-uuid (get-uuid)) (mailpart-body-uuid (get-uuid))) (define (boundary) (wl (conc "--" mailpart-uuid))) (define (body-boundary) (wl (conc "--" mailpart-body-uuid))) (define (email-mime-header) (wl (conc "From: " from_addr)) (wl (conc "To: " to_addr)) (if cc_addr (wl (conc "Cc: " cc_addr))) (if bcc_addr (wl (conc "Bcc: " bcc_addr))) (if more-headers (wl more-headers)) (wl (conc "Subject: " subject)) (wl "MIME-Version: 1.0") (wl (conc "Content-Type: multipart/mixed; boundary=\"" mailpart-uuid "\"")) (wl "") (boundary) (wl (conc "Content-Type: multipart/alternative; boundary=\"" mailpart-body-uuid "\"")) (wl "") ) (define (email-text-body) (body-boundary) (wl "Content-Type: text/plain; charset=ISO-8859-1") (wl "Content-Disposition: inline") (wl "") (wl body) (body-boundary)) (define (email-html-body) (body-boundary) (wl "Content-Type: text/plain; charset=ISO-8859-1") (wl "") (wl "You need to enable HTML option for email") (body-boundary) (wl "Content-Type: text/html; charset=ISO-8859-1") (wl "Content-Disposition: inline") (wl "") (wl body) (body-boundary)) (define (attach-file file) (let* ((filename (filepath:take-file-name file)) (ext-with-dot (filepath:take-extension file)) (ext (string-take-right ext-with-dot (- (string-length ext-with-dot) 1))) (mimetype (ext->mimetype ext)) (uuencode-command (conc "uuencode " file " " filename))) (boundary) (wl (conc "Content-Type: " mimetype "; name=\"" filename "\"")) (wl "Content-Transfer-Encoding: uuencode") (wl (conc "Content-Disposition: attachment; filename=\"" filename "\"")) (wl "") (do-or-die uuencode-command foreach-stdout: (lambda (line) (wl line))))) ;; send the email (email-mime-header) (if use_html (email-html-body) (email-text-body)) (for-each attach-file attach-files-list) (boundary) (close-output-port sendmail-port))) (do-or-die "/usr/sbin/sendmail -t" stdin-proc: sendmail-proc)) ;; like shell "which" command (define (find-exe exe) (let* ((path-items (string-split (or (get-environment-variable "PATH") "") ":"))) (let loop ((rest-path-items path-items)) (if (null? rest-path-items) #f (let* ((this-dir (car rest-path-items)) (next-rest (cdr rest-path-items)) (candidate (conc this-dir "/" exe))) (if (file-execute-access? candidate) candidate (loop next-rest))))))) ;; (define (launch-repl ) ;; (use linenoise) ;; (current-input-port (make-linenoise-port)) ;; (let ((histfile (conc (or (get-environment-variable "HOME") ".") "/." (script-name) "-hist"))) ;; (set-history-length! 30000) ;; (load-history-from-file histfile) ;; (let loop ((l (linenoise "> "))) ;; (cond ((equal? l "bye") ;; (save-history-to-file histfile) ;; "Bye!") ;; ((eof-object? l) ;; (save-history-to-file histfile) ;; (exit)) ;; (else ;; (display l) ;; (handle-exceptions exn ;; ;;(print-call-chain (current-error-port)) ;; (let ((message ((condition-property-accessor 'exn 'message) exn))) ;; (print "exn> " message ) ;; ;;(pp (condition->list exn)) ;; ;;(exit) ;; ;;(display "Went wrong") ;; (newline)) ;; (print (eval l))))) ;; (newline) ;; (history-add l) ;; (loop (linenoise "> "))))) ;; (define (launch-repl2 ) ;; (use readline) ;; (use apropos) ;; (use trace) ;; ;(import csi) ;; (current-input-port (make-readline-port (conc (script-name) "> ") "... ")) ;; ; (install-history-file #f (conc (or (get-environment-variable "HOME") ".") "/." (script-name) "_history")) ;; (parse-and-bind "set editing-mode emacs") ;; (install-history-file) ;; (let loop ((foo #f)) ;; (let ((expr (read))) ;; (cond ;; ((eof-object? expr) (exit)) ;; (else ;; (handle-exceptions exn ;; ;;(print-call-chain (current-error-port)) ;; (let ((message ((condition-property-accessor 'exn 'message) exn))) ;; (print "exn> " message ) ;; ;;(pp (condition->list exn)) ;; ;;(exit) ;; ;;(display "Went wrong") ;; (newline)) ;; (print (eval expr)))))) ;; (loop #f)) ;; ) ;;;; process command line options ;; get command line switches (have no subsequent arg; eg. [-foo]) ;; assumes these are switches without arguments ;; will return list of matches ;; removes matches from command-line-arguments parameter (define (skim-cmdline-opts-noarg-by-regex switch-pattern) (let* ( (irr (irregex switch-pattern)) (matches (filter (lambda (x) (irregex-match irr x)) (command-line-arguments))) (non-matches (filter (lambda (x) (not (member x matches))) (command-line-arguments)))) (command-line-arguments non-matches) matches)) (define (keyword-skim keyword default args #!optional (eqpred equal?)) (let loop ( (kwval default) (args-remaining args) (args-to-return '()) ) (cond ((null? args-remaining) (values (if (list? kwval) (reverse kwval) kwval) (reverse args-to-return))) ((and (> (length args-remaining) 1) (eqpred keyword (car args-remaining))) (if (list? default) (if (equal? default kwval) (loop (list (cadr args-remaining)) (cddr args-remaining) args-to-return) (loop (cons (cadr args-remaining) kwval) (cddr args-remaining) args-to-return)) (loop (cadr args-remaining) (cddr args-remaining) args-to-return))) (else (loop kwval (cdr args-remaining) (cons (car args-remaining) args-to-return)))))) ;; get command line switches (have a subsequent arg; eg. [-foo bar]) ;; assumes these are switches without arguments ;; will return list of arguments to matches ;; removes matches from command-line-arguments parameter (define (re-match? re str) (irregex-match re str)) (define (skim-cmdline-opts-withargs-by-regex switch-pattern) (let-values (((result new-cmdline-args) (keyword-skim switch-pattern '() (command-line-arguments) re-match? ))) (command-line-arguments new-cmdline-args) result)) ;; recognize ducttape-lib command line switches (--quiet, --silent, --color, -d.., -dp.., -logfile) ;; - reset parameters; reset DUCTTAPE_* env vars to match user specified intent ;; - mutate (command-line-arguments) parameter to subtract these recognized and handled switches ;; * beware -- now (argv) and (command-line-arguments) are inconsistent... cannot mutate (argv) alas. Use (command-line-arguments) (define (process-command-line) ;; --quiet (let ((quiet-opts (skim-cmdline-opts-noarg-by-regex "--?quiet"))) (if (not (null? quiet-opts)) (begin (setenv "DUCTTAPE_QUIET_MODE" "1") (ducttape-quiet-mode "1")))) ;; --silent (let ((silent-opts (skim-cmdline-opts-noarg-by-regex "--?silent"))) (if (not (null? silent-opts)) (begin (setenv "DUCTTAPE_SILENT_MODE" "1") (ducttape-silent-mode "1")))) ;; -color (let ((color-opts (skim-cmdline-opts-noarg-by-regex "--?colou?r(ize)?"))) (if (not (null? color-opts)) (begin (setenv "DUCTTAPE_COLORIZE" "1") (ducttape-color-mode "1")))) ;; -nocolor (let ((nocolor-opts (skim-cmdline-opts-noarg-by-regex "--?nocolou?r(ize)?"))) (if (not (null? nocolor-opts)) (begin (unsetenv "DUCTTAPE_COLORIZE" ) (ducttape-color-mode #f)))) ;; -logfile (let ((logfile-opts (skim-cmdline-opts-withargs-by-regex "--?log(-?file)?"))) (if (not (null? logfile-opts)) (begin (ducttape-log-file (car (reverse logfile-opts))) (setenv "DUCTTAPE_LOG_FILE" (ducttape-log-file))))) ;; -d -dd -d# (let ((debug-opts (skim-cmdline-opts-noarg-by-regex "-d(d*|\\d+)")) (initial-debuglevel (if (ducttape-debug-level) (ducttape-debug-level) 0) )) (if (not (null? debug-opts)) (begin (ducttape-debug-level (let loop ((opts debug-opts) (debuglevel initial-debuglevel)) (if (null? opts) debuglevel (let* ( (curopt (car opts)) (restopts (cdr opts)) (ds (string-match "-(d+)" curopt)) (dnum (string-match "-d(\\d+)" curopt))) (cond (ds (loop restopts (+ debuglevel (string-length (cadr ds))))) (dnum (loop restopts (string->number (cadr dnum))))))))) (setenv "DUCTTAPE_DEBUG_LEVEL" (number->string (ducttape-debug-level)))))) ;; -dp <pat> / --debug-pattern <pat> (let ((debugpat-opts (skim-cmdline-opts-withargs-by-regex "--?(debug-pattern|dp)"))) (if (not (null? debugpat-opts)) (begin (ducttape-debug-regex-filter (string-join debugpat-opts "|")) (setenv "DUCTTAPE_DEBUG_PATTERN" (ducttape-debug-regex-filter)))))) ;; handle command line immediately; (process-command-line) ) ; end module |
Modified ducttape/mimetypes.scm from [af9d5bd3b6] to [391fe0b393].
1 2 3 4 | ;; gathered from macosx: ;; cat /etc/apache2/mime.types | grep -v '^#' | perl -ne 'print "(\"$2\" . \"$1\")\n" if /(\S+)\s+(\S+)/' > mimetypes.scm ;; + manual manipulation | | | 1 2 3 4 5 6 7 8 9 10 11 12 | ;; gathered from macosx: ;; cat /etc/apache2/mime.types | grep -v '^#' | perl -ne 'print "(\"$2\" . \"$1\")\n" if /(\S+)\s+(\S+)/' > mimetypes.scm ;; + manual manipulation (define ducttape_ext2mimetype '(("ez" . "application/andrew-inset") ("aw" . "application/applixware") ("atom" . "application/atom+xml") ("atomcat" . "application/atomcat+xml") ("atomsvc" . "application/atomsvc+xml") ("ccxml" . "application/ccxml+xml") ("cdmia" . "application/cdmi-capability") ("cdmic" . "application/cdmi-container") |
︙ | ︙ | |||
774 775 776 777 778 779 780 | ("wvx" . "video/x-ms-wvx") ("avi" . "video/x-msvideo") ("movie" . "video/x-sgi-movie") ("smv" . "video/x-smv") ("ice" . "x-conference/x-cooltalk"))) (define (ext->mimetype ext) | | | 774 775 776 777 778 779 780 781 782 | ("wvx" . "video/x-ms-wvx") ("avi" . "video/x-msvideo") ("movie" . "video/x-sgi-movie") ("smv" . "video/x-smv") ("ice" . "x-conference/x-cooltalk"))) (define (ext->mimetype ext) (let ((x (assoc ext ducttape_ext2mimetype))) (if x (cdr x) "text/plain"))) |
Modified ducttape/test_ducttape.scm from [0e3e1ff756] to [b48b7cef02].
1 2 3 4 5 6 7 8 9 10 | #!/usr/bin/env csi -script (use test) (include "ducttape-lib.scm") (import ducttape-lib) (import ansi-escape-sequences) (use trace) (set! systype (do-or-die (if (file-exists? "/bin/uname") "/bin/uname" "/usr/bin/uname"))) ;(trace skim-cmdline-opts-withargs-by-regex) ;(trace keyword-skim) ;(trace re-match?) | | | | | | | | | | | | | | | | | | | | | | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 | #!/usr/bin/env csi -script (use test) (include "ducttape-lib.scm") (import ducttape-lib) (import ansi-escape-sequences) (use trace) (set! systype (do-or-die (if (file-exists? "/bin/uname") "/bin/uname" "/usr/bin/uname"))) ;(trace skim-cmdline-opts-withargs-by-regex) ;(trace keyword-skim) ;(trace re-match?) (define (reset-ducttape) (unsetenv "ducttape_DEBUG_LEVEL") (ducttape-debug-level #f) (unsetenv "ducttape_DEBUG_PATTERN") (ducttape-debug-regex-filter ".") (unsetenv "ducttape_LOG_FILE") (ducttape-log-file #f) (unsetenv "ducttape_SILENT_MODE") (ducttape-silent-mode #f) (unsetenv "ducttape_QUIET_MODE") (ducttape-quiet-mode #f) (unsetenv "ducttape_COLOR_MODE") (ducttape-color-mode #f) ) (define (reset-ducttape-with-cmdline-list cmdline-list) (reset-ducttape) (command-line-arguments cmdline-list) (process-command-line) ) (define (direct-iputs-test) (ducttape-color-mode #f) (ierr "I'm an error") (iwarn "I'm a warning") (inote "I'm a note") (ducttape-debug-level 1) (idbg "I'm a debug statement") (ducttape-debug-level #f) (idbg "I'm a hidden debug statement") (ducttape-silent-mode #t) (iwarn "I shouldn't show up") (inote "I shouldn't show up either") (ierr "I should show up 1") (ducttape-silent-mode #f) (ducttape-quiet-mode #t) (iwarn "I should show up 2") (inote "I shouldn't show up though") (ierr "I should show up 3") (ducttape-quiet-mode #f) (ducttape-debug-level 1) (idbg "foo") (iputs "dbg" "debug message") (iputs "e" "error message") (iputs "w" "warning message") (iputs "n" "note message") (ducttape-color-mode #t) (ierr "I'm an error COLOR") (iwarn "I'm a warning COLOR") (inote "I'm a note COLOR") (idbg "I'm a debug COLOR") ) |
︙ | ︙ | |||
238 239 240 241 242 243 244 | ) ; end define (define (test-argprocessor ) (test-group "Command line processor parameter settings" | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 | ) ; end define (define (test-argprocessor ) (test-group "Command line processor parameter settings" (reset-ducttape-with-cmdline-list '()) (test-assert "(nil) debug mode should be off" (not (ducttape-debug-level))) (test-assert "(nil): debug pattern should be '.'" (equal? "." (ducttape-debug-regex-filter))) (test-assert "(nil): colors should be off" (not (ducttape-color-mode))) (test-assert "(nil): silent mode should be off" (not (ducttape-silent-mode))) (test-assert "(nil): quiet mode should be off" (not (ducttape-quiet-mode))) (test-assert "(nil): logfile should be off" (not (ducttape-log-file))) (reset-ducttape-with-cmdline-list '("-d")) (test-assert "-d: debug mode should be on at level 1" (eq? 1 (ducttape-debug-level))) (reset-ducttape-with-cmdline-list '("-dd")) (test "-dd: debug level should be 2" 2 (ducttape-debug-level)) (reset-ducttape-with-cmdline-list '("-ddd")) (test "-ddd: debug level should be 3" 3 (ducttape-debug-level)) (reset-ducttape-with-cmdline-list '("-d2")) (test "-d2: debug level should be 2" 2 (ducttape-debug-level)) (reset-ducttape-with-cmdline-list '("-d3")) (test "-d3: debug level should be 3" 3 (ducttape-debug-level)) (reset-ducttape-with-cmdline-list '("-dp" "foo")) (test "-dp foo: debug pattern should be 'foo'" "foo" (ducttape-debug-regex-filter)) (reset-ducttape-with-cmdline-list '("--debug-pattern" "foo")) (test "--debug-pattern foo: debug pattern should be 'foo'" "foo" (ducttape-debug-regex-filter)) (reset-ducttape-with-cmdline-list '("-dp" "foo" "-dp" "bar")) (test "-dp foo -dp bar: debug pattern should be 'foo|bar'" "foo|bar" (ducttape-debug-regex-filter)) (reset-ducttape-with-cmdline-list '("--quiet")) (test-assert "-quiet: quiet mode should be active" (ducttape-quiet-mode)) (reset-ducttape-with-cmdline-list '("--silent")) (test-assert "-silent: silent mode should be active" (ducttape-silent-mode)) (reset-ducttape-with-cmdline-list '("--color")) (test-assert "-color: color mode should be active" (ducttape-color-mode)) (reset-ducttape-with-cmdline-list '("--log" "foo")) (test "--log foo: logfile should be 'foo'" "foo" (ducttape-log-file)) )) (define (test-wwdate) (test-group "wwdate conversion tests" (let ((test-table |
︙ | ︙ | |||
323 324 325 326 327 328 329 | ; (test "settext bold" "\x1b[1mfoo\x1b[0m" (set-text (list 'bold) "foo")) ; ) ; visually inspect this (direct-iputs-test) ; following use unit test test-egg | | | | 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 | ; (test "settext bold" "\x1b[1mfoo\x1b[0m" (set-text (list 'bold) "foo")) ; ) ; visually inspect this (direct-iputs-test) ; following use unit test test-egg (reset-ducttape) (test-argprocessor-funcs) (reset-ducttape) (test-argprocessor) (test-systemstuff) (test-misc) (test-wwdate) ) ; end main() (main) (sendmail "brandon.j.barclay@intel.com" "6hello subject" "test body") ;(sendmail "bjbarcla" "2hello subject html" "test body<h1>hello</h1><i>italics</i>" use_html: #t) ;(sendmail "bb" "4hello attach subject html" "<h2>hmm</h2>" use_html: #t attach-files-list: '( "/Users/bb/Downloads/wdmycloud-manual-4779-705103.pdf" ) ) ;(launch-repl) (test-exit) |